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

Conflicts: phpstan-baseline.php rector.php system/Database/BaseBuilder.php system/Honeypot/Honeypot.php system/Router/RouteCollection.php system/Test/FeatureTestCase.php system/Test/FeatureTestTrait.php system/Validation/FormatRules.php
codeigniter4 · Dec 21, 2023 · ed4fce1 · ed4fce1
2 parents b7bced6 + 9483732
commit ed4fce1
Show file tree

Hide file tree

Showing 52 changed files with 196 additions and 215 deletions.
diff --git a/composer.json b/composer.json
@@ -34,6 +34,9 @@
         "rector/rector": "0.18.12",
         "vimeo/psalm": "^5.0"
     },
+    "replace": {
+        "codeigniter4/framework": "self.version"
+    },
     "suggest": {
         "ext-curl": "If you use CURLRequest class",
         "ext-dom": "If you use TestResponse",