Skip to content

Commit 897b5ae

Browse files
authored
Merge branch 'codeigniter4:develop' into patch-3
2 parents 091e15f + fd9cb65 commit 897b5ae

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

phpstan-baseline.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?php declare(strict_types = 1);
22

3-
$ignoreErrors = [];
4-
$ignoreErrors[] = [
5-
'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\\.$#',
6-
'count' => 1,
7-
'path' => __DIR__ . '/app/Config/Filters.php',
8-
];
93
$ignoreErrors[] = [
104
'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\\.$#',
115
'count' => 1,
@@ -1151,11 +1145,6 @@
11511145
'count' => 1,
11521146
'path' => __DIR__ . '/system/Config/Filters.php',
11531147
];
1154-
$ignoreErrors[] = [
1155-
'message' => '#^Property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$methods type has no value type specified in iterable type array\\.$#',
1156-
'count' => 1,
1157-
'path' => __DIR__ . '/system/Config/Filters.php',
1158-
];
11591148
$ignoreErrors[] = [
11601149
'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#',
11611150
'count' => 1,

system/Config/Filters.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ class Filters extends BaseConfig
102102
* If you use this, you should disable auto-routing because auto-routing
103103
* permits any HTTP method to access a controller. Accessing the controller
104104
* with a method you don't expect could bypass the filter.
105+
*
106+
* @var array<string, list<string>>
105107
*/
106108
public array $methods = [];
107109

user_guide_src/source/dbmgmt/forge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Returns true/false based on success or failure:
4141
.. literalinclude:: forge/003.php
4242

4343
An optional second parameter set to true will add ``IF EXISTS`` statement
44-
or will check if a database exists before create it (depending on DBMS).
44+
or will check if a database exists before creating it (depending on DBMS).
4545

4646
.. literalinclude:: forge/004.php
4747

user_guide_src/source/dbmgmt/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CodeIgniter comes with tools to restructure or seed your database.
77
.. toctree::
88
:titlesonly:
99

10-
Database Manipulation with Database Forge <forge>
10+
Database Forge <forge>
1111
Database Migrations <migration>
1212
Database Seeding <seeds>
1313
db_commands

0 commit comments

Comments
 (0)