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

Conflicts: system/BaseModel.php system/Model.php
codeigniter4 · Dec 7, 2023 · a922030 · a922030
2 parents dce194b + 75d1b3b
commit a922030
Show file tree

Hide file tree

Showing 4 changed files with 246 additions and 201 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -51,11 +51,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in &&, array\\|null given on the left side\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/BaseModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, array\\|null given\\.$#',
 	'count' => 1,
@@ -2543,7 +2538,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 18,
+	'count' => 15,
 	'path' => __DIR__ . '/system/Model.php',
 ];
 $ignoreErrors[] = [