diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml index a5dfc83996cb..ba8f2ffa651c 100644 --- a/.github/workflows/reusable-coveralls.yml +++ b/.github/workflows/reusable-coveralls.yml @@ -63,6 +63,8 @@ jobs: vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov - name: Upload coverage to Coveralls - run: vendor/bin/php-coveralls --verbose --exclude-no-stmt --ansi + run: | + composer global require php-coveralls/php-coveralls + php-coveralls --verbose --exclude-no-stmt --ansi env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/admin/framework/composer.json b/admin/framework/composer.json index b71959158a1e..7b8a30e0b0bb 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -14,7 +14,7 @@ "ext-intl": "*", "ext-mbstring": "*", "laminas/laminas-escaper": "^2.13", - "psr/log": "^2.0" + "psr/log": "^3.0" }, "require-dev": { "codeigniter/coding-standard": "^1.5", diff --git a/composer.json b/composer.json index fc44c46a49dd..3bbc37628568 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-intl": "*", "ext-mbstring": "*", "laminas/laminas-escaper": "^2.13", - "psr/log": "^2.0" + "psr/log": "^3.0" }, "require-dev": { "codeigniter/coding-standard": "^1.5", @@ -25,7 +25,6 @@ "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", "nexusphp/tachycardia": "^1.0", - "php-coveralls/php-coveralls": "^2.5", "phpstan/extension-installer": "^1.3", "phpstan/phpstan": "^1.10.2", "phpstan/phpstan-strict-rules": "^1.5", diff --git a/system/ThirdParty/PSR/Log/LoggerAwareInterface.php b/system/ThirdParty/PSR/Log/LoggerAwareInterface.php index 4d64f4786adb..cc46a95147cd 100644 --- a/system/ThirdParty/PSR/Log/LoggerAwareInterface.php +++ b/system/ThirdParty/PSR/Log/LoggerAwareInterface.php @@ -14,5 +14,5 @@ interface LoggerAwareInterface * * @return void */ - public function setLogger(LoggerInterface $logger); + public function setLogger(LoggerInterface $logger): void; } diff --git a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php index 5f1553a4c810..4fb57a292263 100644 --- a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php +++ b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php @@ -19,7 +19,7 @@ trait LoggerAwareTrait * * @param LoggerInterface $logger */ - public function setLogger(LoggerInterface $logger) + public function setLogger(LoggerInterface $logger): void { $this->logger = $logger; } diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php index b4d062b9b640..b3a24b5f7e9d 100644 --- a/system/ThirdParty/PSR/Log/LoggerInterface.php +++ b/system/ThirdParty/PSR/Log/LoggerInterface.php @@ -27,7 +27,7 @@ interface LoggerInterface * * @return void */ - public function emergency(string|\Stringable $message, array $context = []); + public function emergency(string|\Stringable $message, array $context = []): void; /** * Action must be taken immediately. @@ -40,7 +40,7 @@ public function emergency(string|\Stringable $message, array $context = []); * * @return void */ - public function alert(string|\Stringable $message, array $context = []); + public function alert(string|\Stringable $message, array $context = []): void; /** * Critical conditions. @@ -52,7 +52,7 @@ public function alert(string|\Stringable $message, array $context = []); * * @return void */ - public function critical(string|\Stringable $message, array $context = []); + public function critical(string|\Stringable $message, array $context = []): void; /** * Runtime errors that do not require immediate action but should typically @@ -63,7 +63,7 @@ public function critical(string|\Stringable $message, array $context = []); * * @return void */ - public function error(string|\Stringable $message, array $context = []); + public function error(string|\Stringable $message, array $context = []): void; /** * Exceptional occurrences that are not errors. @@ -76,7 +76,7 @@ public function error(string|\Stringable $message, array $context = []); * * @return void */ - public function warning(string|\Stringable $message, array $context = []); + public function warning(string|\Stringable $message, array $context = []): void; /** * Normal but significant events. @@ -86,7 +86,7 @@ public function warning(string|\Stringable $message, array $context = []); * * @return void */ - public function notice(string|\Stringable $message, array $context = []); + public function notice(string|\Stringable $message, array $context = []): void; /** * Interesting events. @@ -98,7 +98,7 @@ public function notice(string|\Stringable $message, array $context = []); * * @return void */ - public function info(string|\Stringable $message, array $context = []); + public function info(string|\Stringable $message, array $context = []): void; /** * Detailed debug information. @@ -108,7 +108,7 @@ public function info(string|\Stringable $message, array $context = []); * * @return void */ - public function debug(string|\Stringable $message, array $context = []); + public function debug(string|\Stringable $message, array $context = []): void; /** * Logs with an arbitrary level. @@ -121,5 +121,5 @@ public function debug(string|\Stringable $message, array $context = []); * * @throws \Psr\Log\InvalidArgumentException */ - public function log($level, string|\Stringable $message, array $context = []); + public function log($level, string|\Stringable $message, array $context = []): void; } diff --git a/system/ThirdParty/PSR/Log/LoggerTrait.php b/system/ThirdParty/PSR/Log/LoggerTrait.php index 920bda77f835..9c8733f957fd 100644 --- a/system/ThirdParty/PSR/Log/LoggerTrait.php +++ b/system/ThirdParty/PSR/Log/LoggerTrait.php @@ -20,7 +20,7 @@ trait LoggerTrait * * @return void */ - public function emergency(string|\Stringable $message, array $context = []) + public function emergency(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::EMERGENCY, $message, $context); } @@ -36,7 +36,7 @@ public function emergency(string|\Stringable $message, array $context = []) * * @return void */ - public function alert(string|\Stringable $message, array $context = []) + public function alert(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::ALERT, $message, $context); } @@ -51,7 +51,7 @@ public function alert(string|\Stringable $message, array $context = []) * * @return void */ - public function critical(string|\Stringable $message, array $context = []) + public function critical(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::CRITICAL, $message, $context); } @@ -65,7 +65,7 @@ public function critical(string|\Stringable $message, array $context = []) * * @return void */ - public function error(string|\Stringable $message, array $context = []) + public function error(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::ERROR, $message, $context); } @@ -81,7 +81,7 @@ public function error(string|\Stringable $message, array $context = []) * * @return void */ - public function warning(string|\Stringable $message, array $context = []) + public function warning(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::WARNING, $message, $context); } @@ -94,7 +94,7 @@ public function warning(string|\Stringable $message, array $context = []) * * @return void */ - public function notice(string|\Stringable $message, array $context = []) + public function notice(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::NOTICE, $message, $context); } @@ -109,7 +109,7 @@ public function notice(string|\Stringable $message, array $context = []) * * @return void */ - public function info(string|\Stringable $message, array $context = []) + public function info(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::INFO, $message, $context); } @@ -122,7 +122,7 @@ public function info(string|\Stringable $message, array $context = []) * * @return void */ - public function debug(string|\Stringable $message, array $context = []) + public function debug(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::DEBUG, $message, $context); } @@ -138,5 +138,5 @@ public function debug(string|\Stringable $message, array $context = []) * * @throws \Psr\Log\InvalidArgumentException */ - abstract public function log($level, string|\Stringable $message, array $context = []); + abstract public function log($level, string|\Stringable $message, array $context = []): void; } diff --git a/system/ThirdParty/PSR/Log/NullLogger.php b/system/ThirdParty/PSR/Log/NullLogger.php index 56077057159d..c1cc3c0692a2 100644 --- a/system/ThirdParty/PSR/Log/NullLogger.php +++ b/system/ThirdParty/PSR/Log/NullLogger.php @@ -23,7 +23,7 @@ class NullLogger extends AbstractLogger * * @throws \Psr\Log\InvalidArgumentException */ - public function log($level, string|\Stringable $message, array $context = []) + public function log($level, string|\Stringable $message, array $context = []): void { // noop } diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index da38fdd0dd02..dd5c5c8d5820 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -79,7 +79,7 @@ Interface Changes - **ResponseInterface:** The default value of the third parameter ``$expire`` of the ``ResponseInterface::setCookie()`` has been fixed from ``''`` to ``0``. - **Logger:** The `psr/log `_ package has - been upgraded to v2.0.0. + been upgraded to v3.0.0. .. _v450-method-signature-changes: