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

codeigniter4 · Oct 17, 2024 · b068de9 · b068de9
2 parents f5b2100 + 81e6289
commit b068de9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 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.6"
+        "rector/rector": "1.2.7"
     },
     "replace": {
         "codeigniter4/framework": "self.version"

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -15019,18 +15019,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
 ];
-$ignoreErrors[] = [
-	// identifier: property.phpDocType
-	'message' => '#^PHPDoc tag @var for property CodeIgniter\\\\Helpers\\\\FilesystemHelperTest\\:\\:\\$structure with type mixed is not subtype of native type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
-];
-$ignoreErrors[] = [
-	// identifier: missingType.iterableValue
-	'message' => '#^Property CodeIgniter\\\\Helpers\\\\FilesystemHelperTest\\:\\:\\$structure type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
-];
 $ignoreErrors[] = [
 	// identifier: argument.type
 	'message' => '#^Parameter \\#2 \\$value of function form_hidden expects array\\|string, null given\\.$#',

diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -258,7 +258,7 @@ public function start()
         }
 
         $this->initVars();
-        $this->logger->info("Session: Class initialized using '" . $this->config->driver . "' driver.");
+        $this->logger->debug("Session: Class initialized using '" . $this->config->driver . "' driver.");
 
         return $this;
     }

diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
@@ -25,7 +25,7 @@
 final class FilesystemHelperTest extends CIUnitTestCase
 {
     /**
-     * @var array<string, array<string, list<mixed>>>|array<string, array<string, string>>|array<string, list<mixed>>|array<string, mixed>|array<string, string>|mixed
+     * @var array<string, array<string, list<mixed>>>|array<string, array<string, string>>|array<string, list<mixed>>|array<string, mixed>|array<string, string>
      */
     private array $structure;
 

diff --git a/user_guide_src/source/changelogs/v4.5.6.rst b/user_guide_src/source/changelogs/v4.5.6.rst
@@ -29,6 +29,7 @@ Deprecations
 **********
 Bugs Fixed
 **********
+- **Session Library:** The session initialization debug message now uses the correct log type "debug" instead of "info".
 
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_