Merge branch 'develop' into fix-debug-toolbar-logs

mjomble · web-flow · commit 11c0d93c6552 · 2025-10-01T09:36:33.000+03:00
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/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/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/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/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
@@ -28,6 +28,10 @@
 class CreditCardRulesTest 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/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
@@ -28,6 +28,10 @@
 class FileRulesTest 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/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -23,6 +23,9 @@
 #[Group('Others')]
 final class FormatRulesTest extends TraditionalFormatRulesTest
 {
+    /**
+     * @var array<string, array<int|string, array<string, string>|string>>
+     */
     protected array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
@@ -26,6 +26,10 @@
 final class RulesTest extends TraditionalRulesTest
 {
     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/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -23,6 +23,9 @@
 #[Group('Others')]
 final class ValidationTest extends TraditionalValidationTest
 {
+    /**
+     * @var array<string, array<int|string, array<string, array<string, string>|string>|string>|string>
+     */
     protected static array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
@@ -36,6 +36,10 @@
 class ValidationTest extends CIUnitTestCase
 {
     protected Validation $validation;
+
+    /**
+     * @var array<string, array<int|string, array<string, array<string, string>|string>|string>|string>
+     */
     protected static array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/user_guide_src/source/changelogs/v4.6.4.rst b/user_guide_src/source/changelogs/v4.6.4.rst
@@ -40,9 +40,11 @@ Bugs Fixed
 - **Database:** Fixed a bug in ``Database::connect()`` which was causing to store non-shared connection instances in shared cache.
 - **Database:** Fixed a bug in ``Connection::getFieldData()`` for ``SQLSRV`` and ``OCI8`` where extra characters were returned in column default values (specific to those handlers), instead of following the convention used by other drivers.
 - **Database:** Fixed a bug in ``BaseBuilder::compileOrderBy()`` where the method could overwrite ``QBOrderBy`` with a string instead of keeping it as an array, causing type errors and preventing additional ``ORDER BY`` clauses from being appended.
+- **Database:** Fixed a bug in ``SQLite3`` where the password parameter was ignored unless it was an empty string.
 - **Forge:** Fixed a bug in ``Postgre`` and ``SQLSRV`` where changing a column's default value using ``Forge::modifyColumn()`` method produced incorrect SQL syntax.
 - **Model:** Fixed a bug in ``Model::replace()`` where ``created_at`` field (when available) wasn't set correctly.
 - **Model:** Fixed a bug in ``Model::insertBatch()`` and ``Model::updateBatch()`` where casts were not applied to inserted or updated values.
+- **Validation:** Fixed a bug in the ``FormatRules::valid_base64()`` validation rule that caused a TypeError when checking invalid base64 strings.
 - **Debug:** Fixed bugs in ``Collectors\Logs`` that were preventing the "Logs" tab from appearing on the Debug Toolbar.
 
 See the repo's
diff --git a/user_guide_src/source/extending/composer_packages.rst b/user_guide_src/source/extending/composer_packages.rst
@@ -22,7 +22,7 @@ Here's a typical directory structure for a Composer package::
     ├── README.md
     ├── composer.json
     ├── src/
-    │   └── YourClass.php
+    │   └── YourClass.php
     └── tests/
         └── YourClassTest.php
 
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -1,4 +1,5 @@
-# total 2808 errors
+# total 2790 errors
+
 includes:
     - argument.type.neon
     - assign.propertyType.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
`@@ -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
`@@ -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
`@@ -36,14 +36,14 @@ public function testMagicIssetTrue(): void`
`36`	`36`	`{`
`37`	`37`	`$command = new AppInfo($this->logger, service('commands'));`
`38`	`38`
`39`		`- $this->assertTrue(isset($command->group));`
	`39`	`+ $this->assertSame($command->group !== null, isset($command->group)); // @phpstan-ignore isset.property`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function testMagicIssetFalse(): void`
`43`	`43`	`{`
`44`	`44`	`$command = new AppInfo($this->logger, service('commands'));`
`45`	`45`
`46`		`- $this->assertFalse(isset($command->foobar));`
	`46`	`+ $this->assertFalse(isset($command->foobar)); // @phpstan-ignore property.notFound`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public function testMagicGet(): void`
`@@ -57,6 +57,6 @@ public function testMagicGetMissing(): void`
`57`	`57`	`{`
`58`	`58`	`$command = new AppInfo($this->logger, service('commands'));`
`59`	`59`
`60`		`- $this->assertNull($command->foobar);`
	`60`	`+ $this->assertNull($command->foobar); // @phpstan-ignore property.notFound`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,14 +169,14 @@ public function testMagicIssetTrue(): void`
`169`	`169`	`{`
`170`	`170`	`$db = new MockConnection($this->options);`
`171`	`171`
`172`		`- $this->assertTrue(isset($db->charset));`
	`172`	`+ $this->assertSame($db->charset !== null, isset($db->charset)); // @phpstan-ignore isset.property`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`public function testMagicIssetFalse(): void`
`176`	`176`	`{`
`177`	`177`	`$db = new MockConnection($this->options);`
`178`	`178`
`179`		`- $this->assertFalse(isset($db->foobar));`
	`179`	`+ $this->assertFalse(isset($db->foobar)); // @phpstan-ignore property.notFound`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public function testMagicGet(): void`
`@@ -190,7 +190,7 @@ public function testMagicGetMissing(): void`
`190`	`190`	`{`
`191`	`191`	`$db = new MockConnection($this->options);`
`192`	`192`
`193`		`- $this->assertNull($db->foobar);`
	`193`	`+ $this->assertNull($db->foobar); // @phpstan-ignore property.notFound`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ public function testGetterUTC(): void`
`245`	`245`	`$this->assertSame(8, $diff->getDays());`
`246`	`246`	`$this->assertSame(8, $diff->days);`
`247`	`247`	`$this->assertSame(-8, (int) round($diff->getDays(true)));`
`248`		`- $this->assertNull($diff->nonsense);`
	`248`	`+ $this->assertNull($diff->nonsense); // @phpstan-ignore property.notFound`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`public function testGetterDST(): void`
`@@ -259,23 +259,23 @@ public function testGetterDST(): void`
`259`	`259`
`260`	`260`	`// The raw value does not take Daylight Saving Time into account.`
`261`	`261`	`$this->assertSame(-8, (int) round($diff->getDays(true)));`
`262`		`- $this->assertNull($diff->nonsense);`
	`262`	`+ $this->assertNull($diff->nonsense); // @phpstan-ignore property.notFound`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`public function testMagicIssetTrue(): void`
`266`	`266`	`{`
`267`	`267`	`$current = Time::parse('March 10, 2017', 'America/Chicago');`
`268`	`268`	`$diff = $current->difference('March 18, 2017', 'America/Chicago');`
`269`	`269`
`270`		`- $this->assertTrue(isset($diff->days));`
`271`		`- $this->assertFalse(isset($diff->nonsense));`
	`270`	`+ $this->assertTrue(isset($diff->days)); // @phpstan-ignore isset.property`
	`271`	`+ $this->assertFalse(isset($diff->nonsense)); // @phpstan-ignore property.notFound`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`public function testMagicIssetFalse(): void`
`275`	`275`	`{`
`276`	`276`	`$current = Time::parse('March 10, 2017', 'America/Chicago');`
`277`	`277`	`$diff = $current->difference('March 18, 2017', 'America/Chicago');`
`278`	`278`
`279`		`- $this->assertFalse(isset($diff->nonsense));`
	`279`	`+ $this->assertFalse(isset($diff->nonsense)); // @phpstan-ignore property.notFound`
`280`	`280`	`}`
`281`	`281`	`}`