Skip to content

Commit b068de9

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.6
2 parents f5b2100 + 81e6289 commit b068de9

File tree

5 files changed

+4
-15
lines changed

5 files changed

+4
-15
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"phpunit/phpcov": "^9.0.2 || ^10.0",
2929
"phpunit/phpunit": "^10.5.16 || ^11.2",
3030
"predis/predis": "^1.1 || ^2.0",
31-
"rector/rector": "1.2.6"
31+
"rector/rector": "1.2.7"
3232
},
3333
"replace": {
3434
"codeigniter4/framework": "self.version"

phpstan-baseline.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15019,18 +15019,6 @@
1501915019
'count' => 2,
1502015020
'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
1502115021
];
15022-
$ignoreErrors[] = [
15023-
// identifier: property.phpDocType
15024-
'message' => '#^PHPDoc tag @var for property CodeIgniter\\\\Helpers\\\\FilesystemHelperTest\\:\\:\\$structure with type mixed is not subtype of native type array\\.$#',
15025-
'count' => 1,
15026-
'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
15027-
];
15028-
$ignoreErrors[] = [
15029-
// identifier: missingType.iterableValue
15030-
'message' => '#^Property CodeIgniter\\\\Helpers\\\\FilesystemHelperTest\\:\\:\\$structure type has no value type specified in iterable type array\\.$#',
15031-
'count' => 1,
15032-
'path' => __DIR__ . '/tests/system/Helpers/FilesystemHelperTest.php',
15033-
];
1503415022
$ignoreErrors[] = [
1503515023
// identifier: argument.type
1503615024
'message' => '#^Parameter \\#2 \\$value of function form_hidden expects array\\|string, null given\\.$#',

system/Session/Session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function start()
258258
}
259259

260260
$this->initVars();
261-
$this->logger->info("Session: Class initialized using '" . $this->config->driver . "' driver.");
261+
$this->logger->debug("Session: Class initialized using '" . $this->config->driver . "' driver.");
262262

263263
return $this;
264264
}

tests/system/Helpers/FilesystemHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
final class FilesystemHelperTest extends CIUnitTestCase
2626
{
2727
/**
28-
* @var array<string, array<string, list<mixed>>>|array<string, array<string, string>>|array<string, list<mixed>>|array<string, mixed>|array<string, string>|mixed
28+
* @var array<string, array<string, list<mixed>>>|array<string, array<string, string>>|array<string, list<mixed>>|array<string, mixed>|array<string, string>
2929
*/
3030
private array $structure;
3131

user_guide_src/source/changelogs/v4.5.6.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Deprecations
2929
**********
3030
Bugs Fixed
3131
**********
32+
- **Session Library:** The session initialization debug message now uses the correct log type "debug" instead of "info".
3233

3334
See the repo's
3435
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_

0 commit comments

Comments
 (0)