Merge remote-tracking branch 'upstream/develop' into 4.6

codeigniter4 · Aug 27, 2024 · 8e1271e · 8e1271e
2 parents f7c471d + 219010e
commit 8e1271e
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 88 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "1.2.3"
+        "rector/rector": "1.2.4"
     },
     "replace": {
         "codeigniter4/framework": "self.version"

diff --git a/system/ThirdParty/PSR/Log/LoggerAwareInterface.php b/system/ThirdParty/PSR/Log/LoggerAwareInterface.php
@@ -9,10 +9,6 @@ interface LoggerAwareInterface
 {
     /**
      * Sets a logger instance on the object.
-     *
-     * @param LoggerInterface $logger
-     *
-     * @return void
      */
     public function setLogger(LoggerInterface $logger): void;
 }
diff --git a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
@@ -9,15 +9,11 @@ trait LoggerAwareTrait
 {
     /**
      * The logger instance.
-     *
-     * @var LoggerInterface|null
      */
     protected ?LoggerInterface $logger = null;
 
     /**
      * Sets a logger.
-     *
-     * @param LoggerInterface $logger
      */
     public function setLogger(LoggerInterface $logger): void
     {

diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php
@@ -22,10 +22,7 @@ interface LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function emergency(string|\Stringable $message, array $context = []): void;
 
@@ -35,10 +32,7 @@ public function emergency(string|\Stringable $message, array $context = []): voi
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function alert(string|\Stringable $message, array $context = []): void;
 
@@ -47,21 +41,15 @@ public function alert(string|\Stringable $message, array $context = []): void;
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function critical(string|\Stringable $message, array $context = []): void;
 
     /**
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function error(string|\Stringable $message, array $context = []): void;
 
@@ -71,20 +59,14 @@ public function error(string|\Stringable $message, array $context = []): void;
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function warning(string|\Stringable $message, array $context = []): void;
 
     /**
      * Normal but significant events.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function notice(string|\Stringable $message, array $context = []): void;
 
@@ -93,32 +75,22 @@ public function notice(string|\Stringable $message, array $context = []): void;
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function info(string|\Stringable $message, array $context = []): void;
 
     /**
      * Detailed debug information.
      *
-     * @param string|\Stringable $message
      * @param mixed[] $context
-     *
-     * @return void
      */
     public function debug(string|\Stringable $message, array $context = []): void;
 
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed   $level
-     * @param string|\Stringable $message
      * @param mixed[] $context
      *
-     * @return void
-     *
      * @throws \Psr\Log\InvalidArgumentException
      */
     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
@@ -14,11 +14,6 @@ trait LoggerTrait
 {
     /**
      * System is unusable.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function emergency(string|\Stringable $message, array $context = []): void
     {
@@ -30,11 +25,6 @@ public function emergency(string|\Stringable $message, array $context = []): voi
      *
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function alert(string|\Stringable $message, array $context = []): void
     {
@@ -45,11 +35,6 @@ public function alert(string|\Stringable $message, array $context = []): void
      * Critical conditions.
      *
      * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function critical(string|\Stringable $message, array $context = []): void
     {
@@ -59,11 +44,6 @@ public function critical(string|\Stringable $message, array $context = []): void
     /**
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function error(string|\Stringable $message, array $context = []): void
     {
@@ -75,11 +55,6 @@ public function error(string|\Stringable $message, array $context = []): void
      *
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function warning(string|\Stringable $message, array $context = []): void
     {
@@ -88,11 +63,6 @@ public function warning(string|\Stringable $message, array $context = []): void
 
     /**
      * Normal but significant events.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function notice(string|\Stringable $message, array $context = []): void
     {
@@ -103,11 +73,6 @@ public function notice(string|\Stringable $message, array $context = []): void
      * Interesting events.
      *
      * Example: User logs in, SQL logs.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function info(string|\Stringable $message, array $context = []): void
     {
@@ -116,11 +81,6 @@ public function info(string|\Stringable $message, array $context = []): void
 
     /**
      * Detailed debug information.
-     *
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
      */
     public function debug(string|\Stringable $message, array $context = []): void
     {
@@ -130,11 +90,7 @@ public function debug(string|\Stringable $message, array $context = []): void
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed  $level
-     * @param string|\Stringable $message
-     * @param array  $context
-     *
-     * @return void
+     * @param mixed $level
      *
      * @throws \Psr\Log\InvalidArgumentException
      */

diff --git a/system/ThirdParty/PSR/Log/NullLogger.php b/system/ThirdParty/PSR/Log/NullLogger.php
@@ -15,11 +15,7 @@ class NullLogger extends AbstractLogger
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed  $level
-     * @param string|\Stringable $message
-     * @param array $context
-     *
-     * @return void
+     * @param mixed[] $context
      *
      * @throws \Psr\Log\InvalidArgumentException
      */

diff --git a/utils/composer.json b/utils/composer.json
@@ -3,7 +3,7 @@
         "php": "^8.1",
         "codeigniter/coding-standard": "^1.7",
         "ergebnis/composer-normalize": "^2.28",
-        "friendsofphp/php-cs-fixer": "^3.47.1",
+        "friendsofphp/php-cs-fixer": "3.62.*",
         "nexusphp/cs-config": "^3.6",
         "phpmetrics/phpmetrics": "^2.8 || ^3.0rc6",
         "vimeo/psalm": "^5.0"