diff --git a/composer.json b/composer.json index 7dd75b7fc..f7f4c32a6 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "nikic/php-parser": "^4.14.0", "pear/archive_tar": "~1.4.14", "pelago/emogrifier": "^6.0.0", + "psr/log": "^2.0.0", "scssphp/scssphp": "^1.10.3", "symfony/console": "~6.4.0", "symfony/dotenv": "~6.4.0", diff --git a/composer.lock b/composer.lock index f04e30ddc..42f06c7dd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8f21d10c2e9f2f9098698443baa8dd5", + "content-hash": "6d27a76ae44c8f09bd214be169536b43", "packages": [ { "name": "apereo/phpcas", @@ -1827,16 +1827,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { @@ -1845,7 +1845,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1871,9 +1871,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "ralouphie/getallheaders", diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index c394e3b37..00b1ce927 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -3032,8 +3032,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', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index fc0497d3f..7987d341e 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -3407,8 +3407,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f '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', diff --git a/lib/composer/installed.json b/lib/composer/installed.json index ec2489611..599f89007 100644 --- a/lib/composer/installed.json +++ b/lib/composer/installed.json @@ -1902,27 +1902,27 @@ }, { "name": "psr/log", - "version": "3.0.0", - "version_normalized": "3.0.0.0", + "version": "2.0.0", + "version_normalized": "2.0.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { "php": ">=8.0.0" }, - "time": "2021-07-14T16:46:02+00:00", + "time": "2021-07-14T16:41:46+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.0.x-dev" } }, "installation-source": "dist", @@ -1949,7 +1949,7 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, "install-path": "../psr/log" }, diff --git a/lib/composer/installed.php b/lib/composer/installed.php index 7a72d010b..d29cfc02f 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'combodo/itop', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '30fabba7375459537e74897dc7dcdad61f73d10e', + 'reference' => 'a63e3428edfabdb1d71445a11236a67ef38329c6', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -22,7 +22,7 @@ 'combodo/itop' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '30fabba7375459537e74897dc7dcdad61f73d10e', + 'reference' => 'a63e3428edfabdb1d71445a11236a67ef38329c6', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -306,9 +306,9 @@ ), ), 'psr/log' => array( - 'pretty_version' => '3.0.0', - 'version' => '3.0.0.0', - 'reference' => 'fe5ea303b0887d5caefd3d431c3e61ad47037001', + 'pretty_version' => '2.0.0', + 'version' => '2.0.0.0', + 'reference' => 'ef29f6d262798707a9edd554e2b82517ef3a9376', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), diff --git a/lib/psr/log/composer.json b/lib/psr/log/composer.json index 879fc6f53..f3f066719 100644 --- a/lib/psr/log/composer.json +++ b/lib/psr/log/composer.json @@ -20,7 +20,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.0.x-dev" } } } diff --git a/lib/psr/log/src/LoggerAwareInterface.php b/lib/psr/log/src/LoggerAwareInterface.php index cc46a9514..4d64f4786 100644 --- a/lib/psr/log/src/LoggerAwareInterface.php +++ b/lib/psr/log/src/LoggerAwareInterface.php @@ -14,5 +14,5 @@ interface LoggerAwareInterface * * @return void */ - public function setLogger(LoggerInterface $logger): void; + public function setLogger(LoggerInterface $logger); } diff --git a/lib/psr/log/src/LoggerAwareTrait.php b/lib/psr/log/src/LoggerAwareTrait.php index 4fb57a292..5f1553a4c 100644 --- a/lib/psr/log/src/LoggerAwareTrait.php +++ b/lib/psr/log/src/LoggerAwareTrait.php @@ -19,7 +19,7 @@ trait LoggerAwareTrait * * @param LoggerInterface $logger */ - public function setLogger(LoggerInterface $logger): void + public function setLogger(LoggerInterface $logger) { $this->logger = $logger; } diff --git a/lib/psr/log/src/LoggerInterface.php b/lib/psr/log/src/LoggerInterface.php index b3a24b5f7..b4d062b9b 100644 --- a/lib/psr/log/src/LoggerInterface.php +++ b/lib/psr/log/src/LoggerInterface.php @@ -27,7 +27,7 @@ interface LoggerInterface * * @return void */ - public function emergency(string|\Stringable $message, array $context = []): void; + public function emergency(string|\Stringable $message, array $context = []); /** * Action must be taken immediately. @@ -40,7 +40,7 @@ interface LoggerInterface * * @return void */ - public function alert(string|\Stringable $message, array $context = []): void; + public function alert(string|\Stringable $message, array $context = []); /** * Critical conditions. @@ -52,7 +52,7 @@ interface LoggerInterface * * @return void */ - public function critical(string|\Stringable $message, array $context = []): void; + public function critical(string|\Stringable $message, array $context = []); /** * Runtime errors that do not require immediate action but should typically @@ -63,7 +63,7 @@ interface LoggerInterface * * @return void */ - public function error(string|\Stringable $message, array $context = []): void; + public function error(string|\Stringable $message, array $context = []); /** * Exceptional occurrences that are not errors. @@ -76,7 +76,7 @@ interface LoggerInterface * * @return void */ - public function warning(string|\Stringable $message, array $context = []): void; + public function warning(string|\Stringable $message, array $context = []); /** * Normal but significant events. @@ -86,7 +86,7 @@ interface LoggerInterface * * @return void */ - public function notice(string|\Stringable $message, array $context = []): void; + public function notice(string|\Stringable $message, array $context = []); /** * Interesting events. @@ -98,7 +98,7 @@ interface LoggerInterface * * @return void */ - public function info(string|\Stringable $message, array $context = []): void; + public function info(string|\Stringable $message, array $context = []); /** * Detailed debug information. @@ -108,7 +108,7 @@ interface LoggerInterface * * @return void */ - public function debug(string|\Stringable $message, array $context = []): void; + public function debug(string|\Stringable $message, array $context = []); /** * Logs with an arbitrary level. @@ -121,5 +121,5 @@ interface LoggerInterface * * @throws \Psr\Log\InvalidArgumentException */ - public function log($level, string|\Stringable $message, array $context = []): void; + public function log($level, string|\Stringable $message, array $context = []); } diff --git a/lib/psr/log/src/LoggerTrait.php b/lib/psr/log/src/LoggerTrait.php index 9c8733f95..920bda77f 100644 --- a/lib/psr/log/src/LoggerTrait.php +++ b/lib/psr/log/src/LoggerTrait.php @@ -20,7 +20,7 @@ trait LoggerTrait * * @return void */ - public function emergency(string|\Stringable $message, array $context = []): void + public function emergency(string|\Stringable $message, array $context = []) { $this->log(LogLevel::EMERGENCY, $message, $context); } @@ -36,7 +36,7 @@ trait LoggerTrait * * @return void */ - public function alert(string|\Stringable $message, array $context = []): void + public function alert(string|\Stringable $message, array $context = []) { $this->log(LogLevel::ALERT, $message, $context); } @@ -51,7 +51,7 @@ trait LoggerTrait * * @return void */ - public function critical(string|\Stringable $message, array $context = []): void + public function critical(string|\Stringable $message, array $context = []) { $this->log(LogLevel::CRITICAL, $message, $context); } @@ -65,7 +65,7 @@ trait LoggerTrait * * @return void */ - public function error(string|\Stringable $message, array $context = []): void + public function error(string|\Stringable $message, array $context = []) { $this->log(LogLevel::ERROR, $message, $context); } @@ -81,7 +81,7 @@ trait LoggerTrait * * @return void */ - public function warning(string|\Stringable $message, array $context = []): void + public function warning(string|\Stringable $message, array $context = []) { $this->log(LogLevel::WARNING, $message, $context); } @@ -94,7 +94,7 @@ trait LoggerTrait * * @return void */ - public function notice(string|\Stringable $message, array $context = []): void + public function notice(string|\Stringable $message, array $context = []) { $this->log(LogLevel::NOTICE, $message, $context); } @@ -109,7 +109,7 @@ trait LoggerTrait * * @return void */ - public function info(string|\Stringable $message, array $context = []): void + public function info(string|\Stringable $message, array $context = []) { $this->log(LogLevel::INFO, $message, $context); } @@ -122,7 +122,7 @@ trait LoggerTrait * * @return void */ - public function debug(string|\Stringable $message, array $context = []): void + public function debug(string|\Stringable $message, array $context = []) { $this->log(LogLevel::DEBUG, $message, $context); } @@ -138,5 +138,5 @@ trait LoggerTrait * * @throws \Psr\Log\InvalidArgumentException */ - abstract public function log($level, string|\Stringable $message, array $context = []): void; + abstract public function log($level, string|\Stringable $message, array $context = []); } diff --git a/lib/psr/log/src/NullLogger.php b/lib/psr/log/src/NullLogger.php index c1cc3c069..560770571 100644 --- a/lib/psr/log/src/NullLogger.php +++ b/lib/psr/log/src/NullLogger.php @@ -23,7 +23,7 @@ class NullLogger extends AbstractLogger * * @throws \Psr\Log\InvalidArgumentException */ - public function log($level, string|\Stringable $message, array $context = []): void + public function log($level, string|\Stringable $message, array $context = []) { // noop }