Merge branch 'develop' into fix-9727

mjomble · web-flow · commit 7cd64b52fb75 · 2025-10-03T08:20:31.000Z
diff --git a/rector.php b/rector.php
@@ -15,7 +15,6 @@
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
-use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
@@ -183,7 +182,6 @@
         InlineIfToExplicitIfRector::class,
         PreparedValueToEarlyReturnRector::class,
         UnusedForeachValueToArrayKeysRector::class,
-        ChangeArrayPushToArrayAssignRector::class,
         RemoveErrorSuppressInTryCatchStmtsRector::class,
         FuncGetArgsToVariadicParamRector::class,
         MakeInheritedMethodVisibilitySameAsParentRector::class,
@@ -204,4 +202,4 @@
         // keep '\\' prefix string on string '\Foo\Bar'
         StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
     ])
-    ->withCodeQualityLevel(34);
+    ->withCodeQualityLevel(40);
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
@@ -142,7 +142,7 @@ public function showHelp()
     {
         CLI::write(lang('CLI.helpUsage'), 'yellow');
 
-        if (isset($this->usage)) {
+        if ($this->usage !== null) {
             $usage = $this->usage;
         } else {
             $usage = $this->name;
@@ -154,7 +154,7 @@ public function showHelp()
 
         CLI::write($this->setPad($usage, 0, 0, 2));
 
-        if (isset($this->description)) {
+        if ($this->description !== null) {
             CLI::newLine();
             CLI::write(lang('CLI.helpDescription'), 'yellow');
             CLI::write($this->setPad($this->description, 0, 0, 2));
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
@@ -129,7 +129,7 @@ public function discoverCommands()
 
                 $class = new $className($this->logger, $this);
 
-                if (isset($class->group) && ! isset($this->commands[$class->name])) {
+                if ($class->group !== null && ! isset($this->commands[$class->name])) {
                     $this->commands[$class->name] = [
                         'class'       => $className,
                         'file'        => $file,
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -123,7 +123,7 @@ public function connect(bool $persistent = false)
             $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1);
         }
 
-        if (isset($this->strictOn)) {
+        if ($this->strictOn !== null) {
             if ($this->strictOn) {
                 $this->mysqli->options(
                     MYSQLI_INIT_COMMAND,
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -107,7 +107,7 @@ public function connect(bool $persistent = false)
                 $this->database = WRITEPATH . $this->database;
             }
 
-            $sqlite = (! isset($this->password) || $this->password !== '')
+            $sqlite = ($this->password === null || $this->password === '')
                 ? new SQLite3($this->database)
                 : new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
 
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
@@ -47,7 +47,7 @@ class Logs extends BaseCollector
      *
      * @var list<array{level: string, msg: string}>
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * Returns the data of this collector to be formatted in the toolbar.
@@ -68,7 +68,7 @@ public function isEmpty(): bool
     {
         $this->collectLogs();
 
-        return $this->data !== [];
+        return $this->data === [];
     }
 
     /**
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
@@ -404,7 +404,7 @@ protected function populateGlobals(string $name, Request $request, ?array $param
             );
         }
 
-        $_SESSION = $this->session ?? [];
+        $_SESSION = $this->session;
 
         return $request;
     }
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
@@ -62,7 +62,7 @@ public function get(string $key)
     {
         $key = static::validateKey($key, $this->prefix);
 
-        return array_key_exists($key, $this->cache) ? $this->cache[$key] : null;
+        return $this->cache[$key] ?? null;
     }
 
     /**
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
@@ -284,7 +284,13 @@ public function valid_base64($str = null): bool
             $str = (string) $str;
         }
 
-        return base64_encode(base64_decode($str, true)) === $str;
+        $decoded = base64_decode($str, true);
+
+        if ($decoded === false) {
+            return false;
+        }
+
+        return base64_encode($decoded) === $str;
     }
 
     /**
diff --git a/tests/_support/Entity/CustomUser.php b/tests/_support/Entity/CustomUser.php
@@ -38,6 +38,9 @@ private function __construct(
     ) {
     }
 
+    /**
+     * @param array<string, int|list<string>|string|Time|null> $data
+     */
     public static function reconstruct(array $data): static
     {
         return new self(
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
@@ -35,6 +35,8 @@ class TestHandler extends FileHandler
 
     /**
      * Where would the log be written?
+     *
+     * @param array<string, mixed> $config
      */
     public function __construct(array $config)
     {
diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
@@ -129,6 +129,9 @@ protected function afterDeleteMethod(array $data)
         return $data;
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     protected function beforeFindMethod(array $data)
     {
         $this->tokens[]  = 'beforeFind';
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
@@ -36,14 +36,14 @@ public function testMagicIssetTrue(): void
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertTrue(isset($command->group));
+        $this->assertSame($command->group !== null, isset($command->group)); // @phpstan-ignore isset.property
     }
 
     public function testMagicIssetFalse(): void
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertFalse(isset($command->foobar));
+        $this->assertFalse(isset($command->foobar)); // @phpstan-ignore property.notFound
     }
 
     public function testMagicGet(): void
@@ -57,6 +57,6 @@ public function testMagicGetMissing(): void
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertNull($command->foobar);
+        $this->assertNull($command->foobar); // @phpstan-ignore property.notFound
     }
 }
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
@@ -169,14 +169,14 @@ public function testMagicIssetTrue(): void
     {
         $db = new MockConnection($this->options);
 
-        $this->assertTrue(isset($db->charset));
+        $this->assertSame($db->charset !== null, isset($db->charset)); // @phpstan-ignore isset.property
     }
 
     public function testMagicIssetFalse(): void
     {
         $db = new MockConnection($this->options);
 
-        $this->assertFalse(isset($db->foobar));
+        $this->assertFalse(isset($db->foobar)); // @phpstan-ignore property.notFound
     }
 
     public function testMagicGet(): void
@@ -190,7 +190,7 @@ public function testMagicGetMissing(): void
     {
         $db = new MockConnection($this->options);
 
-        $this->assertNull($db->foobar);
+        $this->assertNull($db->foobar); // @phpstan-ignore property.notFound
     }
 
     /**
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
@@ -114,6 +114,9 @@ public function testUpdateWithWhereAndLimit(): void
         }
     }
 
+    /**
+     * @param array<int, mixed> $expected
+     */
     #[DataProvider('provideUpdateBatch')]
     public function testUpdateBatch(string $constraints, array $data, array $expected): void
     {
diff --git a/tests/system/Debug/Toolbar/Collectors/LogsTest.php b/tests/system/Debug/Toolbar/Collectors/LogsTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Log\Logger;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Logger as LoggerConfig;
+use Config\Services;
+use PHPUnit\Framework\Attributes\Group;
+
+/**
+ * @internal
+ */
+#[Group('Others')]
+final class LogsTest extends CIUnitTestCase
+{
+    private Logger $logger;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // The logs collector relies on the logger being in debug mode
+        // so it would populate logCache.
+        $this->logger = new Logger(new LoggerConfig(), debug: true);
+        Services::injectMock('logger', $this->logger);
+    }
+
+    public function testDisplay(): void
+    {
+        // log_message() always creates a new TestLogger instance while
+        // testing, so we need to log directly to our instance.
+        $this->logger->error('Test error');
+        $this->logger->info('Test info');
+
+        $collector = new Logs();
+        $result    = $collector->display();
+
+        $this->assertArrayHasKey('logs', $result);
+        $this->assertCount(2, $result['logs']);
+        $this->assertSame('error', $result['logs'][0]['level']);
+        $this->assertSame('Test error', $result['logs'][0]['msg']);
+        $this->assertSame('info', $result['logs'][1]['level']);
+        $this->assertSame('Test info', $result['logs'][1]['msg']);
+    }
+
+    public function testEmpty(): void
+    {
+        $collector = new Logs();
+        $this->assertTrue($collector->isEmpty());
+    }
+
+    public function testNotEmpty(): void
+    {
+        $this->logger->warning('Test warning');
+
+        $collector = new Logs();
+        $this->assertFalse($collector->isEmpty());
+    }
+}
diff --git a/tests/system/HTTP/CURLRequestShareOptionsTest.php b/tests/system/HTTP/CURLRequestShareOptionsTest.php
@@ -28,6 +28,9 @@
 #[Group('Others')]
 final class CURLRequestShareOptionsTest extends CURLRequestTest
 {
+    /**
+     * @param array<string, mixed> $options
+     */
     protected function getRequest(array $options = []): MockCURLRequest
     {
         $uri = isset($options['baseURI']) ? new URI($options['baseURI']) : new URI();
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
@@ -245,7 +245,7 @@ public function testGetterUTC(): void
         $this->assertSame(8, $diff->getDays());
         $this->assertSame(8, $diff->days);
         $this->assertSame(-8, (int) round($diff->getDays(true)));
-        $this->assertNull($diff->nonsense);
+        $this->assertNull($diff->nonsense); // @phpstan-ignore property.notFound
     }
 
     public function testGetterDST(): void
@@ -259,23 +259,23 @@ public function testGetterDST(): void
 
         // The raw value does not take Daylight Saving Time into account.
         $this->assertSame(-8, (int) round($diff->getDays(true)));
-        $this->assertNull($diff->nonsense);
+        $this->assertNull($diff->nonsense); // @phpstan-ignore property.notFound
     }
 
     public function testMagicIssetTrue(): void
     {
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 18, 2017', 'America/Chicago');
 
-        $this->assertTrue(isset($diff->days));
-        $this->assertFalse(isset($diff->nonsense));
+        $this->assertTrue(isset($diff->days)); // @phpstan-ignore isset.property
+        $this->assertFalse(isset($diff->nonsense)); // @phpstan-ignore property.notFound
     }
 
     public function testMagicIssetFalse(): void
     {
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 18, 2017', 'America/Chicago');
 
-        $this->assertFalse(isset($diff->nonsense));
+        $this->assertFalse(isset($diff->nonsense)); // @phpstan-ignore property.notFound
     }
 }
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
@@ -24,6 +24,10 @@
 final class CreditCardRulesTest extends StrictCreditCardRulesTest
 {
     protected Validation $validation;
+
+    /**
+     * @var array<string, array<int|string, array<string, string>|string>>
+     */
     protected array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
@@ -24,6 +24,10 @@
 final class FileRulesTest extends StrictFileRulesTest
 {
     protected Validation $validation;
+
+    /**
+     * @var array<string, array<int|string, array<string, string>|string>>
+     */
     protected array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
@@ -31,6 +31,10 @@ class FormatRulesTest extends CIUnitTestCase
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
 
     protected Validation $validation;
+
+    /**
+     * @var array<string, array<int|string, array<string, string>|string>>
+     */
     protected array $config = [
         'ruleSets' => [
             Rules::class,
@@ -1053,6 +1057,10 @@ public static function provideBase64(): iterable
                 'FA08GG',
                 false,
             ],
+            [
+                'dGVszdA==',
+                false,
+            ],
             [
                 null,
                 false,
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
@@ -29,6 +29,10 @@
 class RulesTest extends CIUnitTestCase
 {
     protected Validation $validation;
+
+    /**
+     * @var array<string, array<int|string, array<string, string>|string>>
+     */
     protected array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
diff --git a/user_guide_src/source/changelogs/v4.6.4.rst b/user_guide_src/source/changelogs/v4.6.4.rst
diff --git a/user_guide_src/source/extending/composer_packages.rst b/user_guide_src/source/extending/composer_packages.rst
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
diff --git a/utils/phpstan-baseline/missingType.iterableValue.neon b/utils/phpstan-baseline/missingType.iterableValue.neon
diff --git a/utils/phpstan-baseline/property.notFound.neon b/utils/phpstan-baseline/property.notFound.neon

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function connect(bool $persistent = false)`
`123`	`123`	`$this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1);`
`124`	`124`	`}`
`125`	`125`
`126`		`- if (isset($this->strictOn)) {`
	`126`	`+ if ($this->strictOn !== null) {`
`127`	`127`	`if ($this->strictOn) {`
`128`	`128`	`$this->mysqli->options(`
`129`	`129`	`MYSQLI_INIT_COMMAND,`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function connect(bool $persistent = false)`
`107`	`107`	`$this->database = WRITEPATH . $this->database;`
`108`	`108`	`}`
`109`	`109`
`110`		`- $sqlite = (! isset($this->password) \|\| $this->password !== '')`
	`110`	`+ $sqlite = ($this->password === null \|\| $this->password === '')`
`111`	`111`	`? new SQLite3($this->database)`
`112`	`112`	`: new SQLite3($this->database, SQLITE3_OPEN_READWRITE \| SQLITE3_OPEN_CREATE, $this->password);`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class Logs extends BaseCollector`
`47`	`47`	`*`
`48`	`48`	`* @var list<array{level: string, msg: string}>`
`49`	`49`	`*/`
`50`		`- protected $data;`
	`50`	`+ protected $data = [];`
`51`	`51`
`52`	`52`	`/**`
`53`	`53`	`* Returns the data of this collector to be formatted in the toolbar.`
`@@ -68,7 +68,7 @@ public function isEmpty(): bool`
`68`	`68`	`{`
`69`	`69`	`$this->collectLogs();`
`70`	`70`
`71`		`- return $this->data !== [];`
	`71`	`+ return $this->data === [];`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ protected function populateGlobals(string $name, Request $request, ?array $param`
`404`	`404`	`);`
`405`	`405`	`}`
`406`	`406`
`407`		`- $_SESSION = $this->session ?? [];`
	`407`	`+ $_SESSION = $this->session;`
`408`	`408`
`409`	`409`	`return $request;`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function get(string $key)`
`62`	`62`	`{`
`63`	`63`	`$key = static::validateKey($key, $this->prefix);`
`64`	`64`
`65`		`- return array_key_exists($key, $this->cache) ? $this->cache[$key] : null;`
	`65`	`+ return $this->cache[$key] ?? null;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,13 @@ public function valid_base64($str = null): bool`
`284`	`284`	`$str = (string) $str;`
`285`	`285`	`}`
`286`	`286`
`287`		`- return base64_encode(base64_decode($str, true)) === $str;`
	`287`	`+ $decoded = base64_decode($str, true);`
	`288`	`+`
	`289`	`+ if ($decoded === false) {`
	`290`	`+ return false;`
	`291`	`+ }`
	`292`	`+`
	`293`	`+ return base64_encode($decoded) === $str;`
`288`	`294`	`}`
`289`	`295`
`290`	`296`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ private function __construct(`
`38`	`38`	`) {`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ /**`
	`42`	`+ * @param array<string, int\|list<string>\|string\|Time\|null> $data`
	`43`	`+ */`
`41`	`44`	`public static function reconstruct(array $data): static`
`42`	`45`	`{`
`43`	`46`	`return new self(`