Merge branch 'codeigniter4:develop' into patch-3

codeigniter4 · May 5, 2024 · 897b5ae · 897b5ae
2 parents 091e15f + fd9cb65
commit 897b5ae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -1,11 +1,5 @@
 <?php declare(strict_types = 1);
 
-$ignoreErrors = [];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, array\\<int, string\\>\\> of property Config\\\\Filters\\:\\:\\$methods is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$methods\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/app/Config/Filters.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^PHPDoc type array\\<string, array\\<string, array\\<int, string\\>\\>\\> of property Config\\\\Filters\\:\\:\\$filters is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$filters\\.$#',
 	'count' => 1,
@@ -1151,11 +1145,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Config/Filters.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$methods type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Config/Filters.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 1,

diff --git a/system/Config/Filters.php b/system/Config/Filters.php
@@ -102,6 +102,8 @@ class Filters extends BaseConfig
      * If you use this, you should disable auto-routing because auto-routing
      * permits any HTTP method to access a controller. Accessing the controller
      * with a method you don't expect could bypass the filter.
+     *
+     * @var array<string, list<string>>
      */
     public array $methods = [];
 

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
@@ -41,7 +41,7 @@ Returns true/false based on success or failure:
 .. literalinclude:: forge/003.php
 
 An optional second parameter set to true will add ``IF EXISTS`` statement
-or will check if a database exists before create it (depending on DBMS).
+or will check if a database exists before creating it (depending on DBMS).
 
 .. literalinclude:: forge/004.php
 

diff --git a/user_guide_src/source/dbmgmt/index.rst b/user_guide_src/source/dbmgmt/index.rst
@@ -7,7 +7,7 @@ CodeIgniter comes with tools to restructure or seed your database.
 .. toctree::
     :titlesonly:
 
-    Database Manipulation with Database Forge <forge>
+    Database Forge <forge>
     Database Migrations <migration>
     Database Seeding <seeds>
     db_commands