diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 9188a75a0f..47ca52ad2d 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -53,7 +53,8 @@ class MFCompiler { const DATA_PRECOMPILED_FOLDER = 'data' . DIRECTORY_SEPARATOR . 'precompiled_styles' . DIRECTORY_SEPARATOR; - private static $oThemeHandlerService; + /** @var \ThemeHandlerService */ + protected static $oThemeHandlerService; /** @var \ModelFactory */ protected $oFactory; diff --git a/test/setup/MFCompilerTest.php b/test/setup/MFCompilerTest.php index 98faae6306..6e81789a3a 100644 --- a/test/setup/MFCompilerTest.php +++ b/test/setup/MFCompilerTest.php @@ -148,15 +148,17 @@ class MFCompilerTest extends ItopTestCase { } public function testCompileThemes(){ - $sXmlDataCustoFilePath = realpath(__DIR__ . '/ressources/datamodels/datamodel-branding.xml'); + $sFullmoonThemeCompiledFolder = $this->sTmpDir.DIRECTORY_SEPARATOR.'branding'.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.'fullmoon'.DIRECTORY_SEPARATOR; + + $sXmlDataCustoFilePath = realpath(__DIR__.'/ressources/datamodels/datamodel-branding.xml'); $oDom = new MFDocument(); $oDom->load($sXmlDataCustoFilePath); /** @var \MFElement $oBrandingNode */ $oBrandingNode = $oDom->GetNodes('branding')->item(0); - $this->RecurseMkdir($this->sTmpDir.'/branding/themes/fullmoon/'); - file_put_contents($this->sTmpDir.'/branding/themes/fullmoon/main.css', ""); + $this->RecurseMkdir($sFullmoonThemeCompiledFolder); + file_put_contents($sFullmoonThemeCompiledFolder.'main.css', ""); $aImportsPaths = array( APPROOT.'css/',