add recurseMkdir

2026-05-17 06:18:44 +02:00 · 2020-06-08 14:49:16 +02:00
parent 4741012fb9
commit 19ee8e4071
3 changed files with 27 additions and 40 deletions
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -151,6 +151,7 @@ return array(
    'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
    'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
    'Combodo\\iTop\\TwigExtension' => $baseDir . '/application/twigextension.class.inc.php',
+    'CompileCSSService' => $baseDir . '/application/themehandler.class.inc.php',
    'Config' => $baseDir . '/core/config.class.inc.php',
    'ConfigException' => $baseDir . '/core/config.class.inc.php',
    'ConfigPlaceholdersResolver' => $baseDir . '/core/config.class.inc.php',
@@ -266,7 +267,6 @@ return array(
    'HistoryBlock' => $baseDir . '/application/displayblock.class.inc.php',
    'Html2Text\\Html2Text' => $baseDir . '/application/Html2Text.php',
    'Html2Text\\Html2TextException' => $baseDir . '/application/Html2TextException.php',
-    'ILogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
    'ITopArchiveTar' => $baseDir . '/core/tar-itop.class.inc.php',
    'InlineImage' => $baseDir . '/core/inlineimage.class.inc.php',
    'InlineImageGC' => $baseDir . '/core/inlineimage.class.inc.php',
@@ -285,6 +285,7 @@ return array(
    'ListOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
    'LogAPI' => $baseDir . '/core/log.class.inc.php',
    'LogFileNameBuilderFactory' => $baseDir . '/core/log.class.inc.php',
+    'LogFileRotationProcess' => $baseDir . '/core/log.class.inc.php',
    'LoginBlockExtension' => $baseDir . '/application/logintwig.class.inc.php',
    'LoginTwigContext' => $baseDir . '/application/logintwig.class.inc.php',
    'LoginTwigRenderer' => $baseDir . '/application/logintwig.class.inc.php',
@@ -302,6 +303,7 @@ return array(
    'ModuleDesign' => $baseDir . '/core/moduledesign.class.inc.php',
    'ModuleHandlerAPI' => $baseDir . '/core/modulehandler.class.inc.php',
    'ModuleHandlerApiInterface' => $baseDir . '/core/modulehandler.class.inc.php',
+    'MonthlyRotatingLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
    'MyHelpers' => $baseDir . '/core/MyHelpers.class.inc.php',
    'MySQLException' => $baseDir . '/core/cmdbsource.class.inc.php',
    'MySQLHasGoneAwayException' => $baseDir . '/core/cmdbsource.class.inc.php',
@@ -603,9 +605,6 @@ return array(
    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
    'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
    'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
    'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
@@ -844,9 +843,6 @@ return array(
    'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
    'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateReference.php',
    'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => $vendorDir . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => $vendorDir . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => $vendorDir . '/symfony/framework-bundle/Test/KernelTestCase.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => $vendorDir . '/symfony/framework-bundle/Test/WebTestCase.php',
    'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => $vendorDir . '/symfony/framework-bundle/Translation/PhpExtractor.php',
    'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => $vendorDir . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
    'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => $vendorDir . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1659,7 +1655,6 @@ return array(
    'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
    'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
    'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-    'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
    'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
    'Symfony\\Component\\Yaml\\Command\\LintCommand' => $vendorDir . '/symfony/yaml/Command/LintCommand.php',
    'Symfony\\Component\\Yaml\\Dumper' => $vendorDir . '/symfony/yaml/Dumper.php',
@@ -1863,8 +1858,6 @@ return array(
    'Twig\\Source' => $vendorDir . '/twig/twig/src/Source.php',
    'Twig\\Template' => $vendorDir . '/twig/twig/src/Template.php',
    'Twig\\TemplateWrapper' => $vendorDir . '/twig/twig/src/TemplateWrapper.php',
-    'Twig\\Test\\IntegrationTestCase' => $vendorDir . '/twig/twig/src/Test/IntegrationTestCase.php',
-    'Twig\\Test\\NodeTestCase' => $vendorDir . '/twig/twig/src/Test/NodeTestCase.php',
    'Twig\\Token' => $vendorDir . '/twig/twig/src/Token.php',
    'Twig\\TokenParser\\AbstractTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
    'Twig\\TokenParser\\ApplyTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2062,11 +2055,6 @@ return array(
    'Twig_Test' => $vendorDir . '/twig/twig/lib/Twig/Test.php',
    'Twig_TestCallableInterface' => $vendorDir . '/twig/twig/lib/Twig/TestCallableInterface.php',
    'Twig_TestInterface' => $vendorDir . '/twig/twig/lib/Twig/TestInterface.php',
-    'Twig_Test_Function' => $vendorDir . '/twig/twig/lib/Twig/Test/Function.php',
-    'Twig_Test_IntegrationTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
-    'Twig_Test_Method' => $vendorDir . '/twig/twig/lib/Twig/Test/Method.php',
-    'Twig_Test_Node' => $vendorDir . '/twig/twig/lib/Twig/Test/Node.php',
-    'Twig_Test_NodeTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
    'Twig_Token' => $vendorDir . '/twig/twig/lib/Twig/Token.php',
    'Twig_TokenParser' => $vendorDir . '/twig/twig/lib/Twig/TokenParser.php',
    'Twig_TokenParserBroker' => $vendorDir . '/twig/twig/lib/Twig/TokenParserBroker.php',
@@ -2138,6 +2126,7 @@ return array(
    'iDBObjectSetIterator' => $baseDir . '/core/dbobjectiterator.php',
    'iDBObjectURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
    'iDisplay' => $baseDir . '/core/dbobject.class.php',
+    'iLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
    'iLoginExtension' => $baseDir . '/application/applicationextension.inc.php',
    'iLoginFSMExtension' => $baseDir . '/application/applicationextension.inc.php',
    'iLoginUIExtension' => $baseDir . '/application/applicationextension.inc.php',
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -381,6 +381,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
        'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
        'Combodo\\iTop\\TwigExtension' => __DIR__ . '/../..' . '/application/twigextension.class.inc.php',
+        'CompileCSSService' => __DIR__ . '/../..' . '/application/themehandler.class.inc.php',
        'Config' => __DIR__ . '/../..' . '/core/config.class.inc.php',
        'ConfigException' => __DIR__ . '/../..' . '/core/config.class.inc.php',
        'ConfigPlaceholdersResolver' => __DIR__ . '/../..' . '/core/config.class.inc.php',
@@ -496,7 +497,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'HistoryBlock' => __DIR__ . '/../..' . '/application/displayblock.class.inc.php',
        'Html2Text\\Html2Text' => __DIR__ . '/../..' . '/application/Html2Text.php',
        'Html2Text\\Html2TextException' => __DIR__ . '/../..' . '/application/Html2TextException.php',
-        'ILogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'ITopArchiveTar' => __DIR__ . '/../..' . '/core/tar-itop.class.inc.php',
        'InlineImage' => __DIR__ . '/../..' . '/core/inlineimage.class.inc.php',
        'InlineImageGC' => __DIR__ . '/../..' . '/core/inlineimage.class.inc.php',
@@ -515,6 +515,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'ListOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
        'LogAPI' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'LogFileNameBuilderFactory' => __DIR__ . '/../..' . '/core/log.class.inc.php',
+        'LogFileRotationProcess' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'LoginBlockExtension' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php',
        'LoginTwigContext' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php',
        'LoginTwigRenderer' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php',
@@ -532,6 +533,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'ModuleDesign' => __DIR__ . '/../..' . '/core/moduledesign.class.inc.php',
        'ModuleHandlerAPI' => __DIR__ . '/../..' . '/core/modulehandler.class.inc.php',
        'ModuleHandlerApiInterface' => __DIR__ . '/../..' . '/core/modulehandler.class.inc.php',
+        'MonthlyRotatingLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'MyHelpers' => __DIR__ . '/../..' . '/core/MyHelpers.class.inc.php',
        'MySQLException' => __DIR__ . '/../..' . '/core/cmdbsource.class.inc.php',
        'MySQLHasGoneAwayException' => __DIR__ . '/../..' . '/core/cmdbsource.class.inc.php',
@@ -833,9 +835,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
        'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
        'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
-        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
        'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
        'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
        'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
@@ -1074,9 +1073,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
        'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateReference.php',
        'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/KernelTestCase.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/WebTestCase.php',
        'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpExtractor.php',
        'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
        'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1889,7 +1885,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
        'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
        'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-        'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
        'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
        'Symfony\\Component\\Yaml\\Command\\LintCommand' => __DIR__ . '/..' . '/symfony/yaml/Command/LintCommand.php',
        'Symfony\\Component\\Yaml\\Dumper' => __DIR__ . '/..' . '/symfony/yaml/Dumper.php',
@@ -2093,8 +2088,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Twig\\Source' => __DIR__ . '/..' . '/twig/twig/src/Source.php',
        'Twig\\Template' => __DIR__ . '/..' . '/twig/twig/src/Template.php',
        'Twig\\TemplateWrapper' => __DIR__ . '/..' . '/twig/twig/src/TemplateWrapper.php',
-        'Twig\\Test\\IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/IntegrationTestCase.php',
-        'Twig\\Test\\NodeTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/NodeTestCase.php',
        'Twig\\Token' => __DIR__ . '/..' . '/twig/twig/src/Token.php',
        'Twig\\TokenParser\\AbstractTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
        'Twig\\TokenParser\\ApplyTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2292,11 +2285,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Twig_Test' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test.php',
        'Twig_TestCallableInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestCallableInterface.php',
        'Twig_TestInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestInterface.php',
-        'Twig_Test_Function' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Function.php',
-        'Twig_Test_IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
-        'Twig_Test_Method' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Method.php',
-        'Twig_Test_Node' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Node.php',
-        'Twig_Test_NodeTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
        'Twig_Token' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Token.php',
        'Twig_TokenParser' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParser.php',
        'Twig_TokenParserBroker' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParserBroker.php',
@@ -2368,6 +2356,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'iDBObjectSetIterator' => __DIR__ . '/../..' . '/core/dbobjectiterator.php',
        'iDBObjectURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
        'iDisplay' => __DIR__ . '/../..' . '/core/dbobject.class.php',
+        'iLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'iLoginExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
        'iLoginFSMExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
        'iLoginUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
--- a/test/application/ThemeHandlerTest.php
+++ b/test/application/ThemeHandlerTest.php
@@ -28,12 +28,7 @@ class ThemeHandlerTest extends ItopTestCase
 		$this->tmpDir=$this->tmpdir();
 		$aDirsToCleanup[] = $this->tmpDir;

-		if (!is_dir($this->tmpDir ."/branding"))
-		{
-			@mkdir($this->tmpDir."/branding");
-		}
-		@mkdir($this->tmpDir."/branding/themes/");
-		@mkdir($this->tmpDir."/branding/themes/basque-red");
+		$this->recurseMkdir($this->tmpDir."/branding/themes/basque-red");
 		$this->cssPath = $this->tmpDir . '/branding/themes/basque-red/main.css';
 		$this->jsonThemeParamFile = $this->tmpDir . '/branding/themes/basque-red/theme-parameters.json';
 		$this->recurse_copy(APPROOT."/test/application/theme-handler/expected/css", $this->tmpDir."/branding/css");
@@ -162,9 +157,9 @@ class ThemeHandlerTest extends ItopTestCase
 				$aStylesheetFiles[] = $sFile;
 			}
 			$sThemeFolderPath = APPROOT.'env-production/branding/themes/'.$sThemeId.'/test';
-			if (!is_dir($sThemeFolderPath))
+			if (!$this->recurseMkdir($sThemeFolderPath))
 			{
-				mkdir($sThemeFolderPath);
+				$this->assertTrue(false, "Cannot create directory $sThemeFolderPath");
 			}

 			$aIncludedImages=ThemeHandler::GetIncludedImages($aThemeParameters['variables'], $aStylesheetFiles, $sThemeFolderPath);
@@ -173,7 +168,22 @@ class ThemeHandlerTest extends ItopTestCase
 			rmdir($sThemeFolderPath);
 			$this->assertEquals($precompiledSig, $compiled_json_sig, "Precompiled signature does not match currently compiled one on theme '".$sThemeId."' (cf precompiledsheet $sPrecompiledStylesheet / datamodel $xmlDataCusto)");
 		}
+	}

+	function recurseMkdir($dir)
+	{
+		if (is_dir($dir))
+		{
+			return true;
+		}
+
+		$sParentDir = dirname($dir);
+		if (!$this->recurseMkdir($sParentDir))
+		{
+			return false;
+		}
+
+		return @mkdir($dir);
 	}

 	public function providePrecompiledStyleSheets()
@@ -324,8 +334,7 @@ JSON;
 		copy(APPROOT."test/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css", $cssPath);

 		$sAbsoluteImagePath = APPROOT .'test/application/theme-handler/copied/testimages/';
-		@mkdir(APPROOT .'test/application/theme-handler/copied/');
-		@mkdir($sAbsoluteImagePath);
+		$this->recurseMkdir($sAbsoluteImagePath);
 		$aDirsToCleanup[] = $sAbsoluteImagePath;
 		$this->recurse_copy(APPROOT .'test/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);