Merge branch 'develop' into 4.6

paulbalandan · paulbalandan · commit 80719d473b37 · 2025-01-18T01:42:58.000+08:00
diff --git a/.github/mergeable.yml b/.github/mergeable.yml
@@ -13,7 +13,7 @@ mergeable:
                   regex: '### PHP Version'
               - do: description
                 must_include:
-                  regex: '### CodeIgniter Version'
+                  regex: '### CodeIgniter4 Version'
           - do: author
             must_include:
               regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik$
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -40,17 +40,7 @@
     ]);
 
 $overrides = [
-    'get_class_to_class_keyword'  => true,
-    'trailing_comma_in_multiline' => [
-        'after_heredoc' => true,
-        'elements'      => [
-            'arguments',
-            'array_destructuring',
-            'arrays',
-            'match',
-            'parameters',
-        ],
-    ],
+    'modernize_strpos' => ['modernize_stripos' => true],
 ];
 
 $options = [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,7 +11,6 @@
     failOnWarning="true"
     cacheDirectory="build/.phpunit.cache">
     <coverage
-        includeUncoveredFiles="true"
         pathCoverage="false"
         ignoreDeprecatedCodeUnits="true"
         disableCodeCoverageIgnore="true">
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
         if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-            && stripos($field['type'], 'int') !== false
+            && str_contains(strtolower($field['type']), 'int')
         ) {
             $field['auto_increment'] = ' AUTO_INCREMENT';
         }
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
         if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-            && stripos($field['type'], 'NUMBER') !== false
+            && str_contains(strtolower($field['type']), 'number')
             && version_compare($this->db->getVersion(), '12.1', '>=')
         ) {
             $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
     protected function _attributeType(array &$attributes)
     {
         // Reset field lengths for data types that don't support it
-        if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
+        if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
             $attributes['CONSTRAINT'] = null;
         }
 
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
     protected function _attributeType(array &$attributes)
     {
         // Reset field lengths for data types that don't support it
-        if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
+        if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
             $attributes['CONSTRAINT'] = null;
         }
 
@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
-        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
             $field['auto_increment'] = ' IDENTITY(1,1)';
         }
     }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
         if (
             ! empty($attributes['AUTO_INCREMENT'])
             && $attributes['AUTO_INCREMENT'] === true
-            && stripos($field['type'], 'int') !== false
+            && str_contains(strtolower($field['type']), 'int')
         ) {
             $field['type']           = 'INTEGER PRIMARY KEY';
             $field['default']        = '';
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 
         $attributes = stringify_attributes($attributes);
 
-        if (stripos($attributes, 'method=') === false) {
+        if (! str_contains(strtolower($attributes), 'method=')) {
             $attributes .= ' method="post"';
         }
-        if (stripos($attributes, 'accept-charset=') === false) {
+        if (! str_contains(strtolower($attributes), 'accept-charset=')) {
             $config = config(App::class);
             $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
         }
@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
         // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
         $before = service('filters')->getFilters()['before'];
 
-        if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
+        if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
             $form .= csrf_field($csrfId ?? null);
         }
 
@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
         }
 
         // Unsets default rows and cols if defined in extra field as array or string.
-        if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
+        if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
             unset($defaults['rows']);
         }
 
-        if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
+        if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
             unset($defaults['cols']);
         }
 
@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
     {
         $extra = stringify_attributes($extra);
 
-        if (stripos($extra, 'multiple') === false) {
+        if (! str_contains(strtolower($extra), strtolower('multiple'))) {
             $extra .= ' multiple="multiple"';
         }
 
@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
         }
 
         $extra    = stringify_attributes($extra);
-        $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
+        $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
         $form     = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";
 
         foreach ($options as $key => $val) {
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
@@ -518,7 +518,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st
 
         foreach (xdebug_get_headers() as $emittedHeader) {
             $found = $ignoreCase
-                ? (stripos($emittedHeader, $header) === 0)
+                ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
                 : (str_starts_with($emittedHeader, $header));
 
             if ($found) {
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
@@ -380,12 +380,12 @@ protected function guessFormatter($field): string
 
         // Check some common partials
         foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
-            if (stripos($field, $term) !== false) {
+            if (str_contains(strtolower($field), strtolower($term))) {
                 return $term;
             }
         }
 
-        if (stripos($field, 'phone') !== false) {
+        if (str_contains(strtolower($field), 'phone')) {
             return 'phoneNumber';
         }
 
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void
 
         $this->config->handler = 'dummy';
 
-        if (stripos('win', php_uname()) === 0) {
-            $this->assertTrue(true); // can't test properly if we are on Windows
+        if (is_windows()) {
+            $this->markTestSkipped('Cannot test this properly on Windows.');
         } else {
             $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
         }
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
@@ -124,7 +124,7 @@ public function testDetermineCodes(): void
         $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404)));
         $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('This.', 167)));
         $this->assertSame([500, EXIT_CONFIG], $determineCodes(new ConfigException('This.')));
-        $this->assertSame([500, EXIT_CONFIG], $determineCodes(new CastException('This.')));
+        $this->assertSame([500, EXIT_CONFIG], $determineCodes(CastException::forInvalidInterface('This.')));
         $this->assertSame([500, EXIT_DATABASE], $determineCodes(new DatabaseException('This.')));
     }
 
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
@@ -16,19 +16,17 @@
 use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Test\CIUnitTestCase;
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
 
 /**
  * @internal
  */
-#[CoversClass(DebugTraceableTrait::class)]
 #[Group('Others')]
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
     public function testFactoryInstanceReturnsWhereItIsRaised(): void
     {
-        $e1 = new FrameworkException('Hello.');
+        $e1 = new FrameworkException('Hello.'); // @phpstan-ignore codeigniter.frameworkExceptionInstance
         $e2 = FrameworkException::forEnabledZlibOutputCompression();
 
         $this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
diff --git a/utils/phpstan-baseline/codeigniter.frameworkExceptionInstance.neon b/utils/phpstan-baseline/codeigniter.frameworkExceptionInstance.neon
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -2,7 +2,6 @@ includes:
     - argument.type.neon
     - assign.propertyType.neon
     - codeigniter.cacheHandlerInstance.neon
-    - codeigniter.frameworkExceptionInstance.neon
     - codeigniter.getReassignArray.neon
     - codeigniter.modelArgumentInstanceof.neon
     - codeigniter.modelArgumentType.neon
diff --git a/utils/phpstan-baseline/method.alreadyNarrowedType.neon b/utils/phpstan-baseline/method.alreadyNarrowedType.neon
@@ -1,4 +1,4 @@
-# total 17 errors
+# total 16 errors
 
 parameters:
     ignoreErrors:
@@ -12,11 +12,6 @@ parameters:
             count: 2
             path: ../../tests/system/CLI/CLITest.php
 
-        -
-            message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-            count: 1
-            path: ../../tests/system/Cache/CacheFactoryTest.php
-
         -
             message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
             count: 1

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)`
`1061`	`1061`	`protected function _attributeAutoIncrement(array &$attributes, array &$field)`
`1062`	`1062`	`{`
`1063`	`1063`	`if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true`
`1064`		`- && stripos($field['type'], 'int') !== false`
	`1064`	`+ && str_contains(strtolower($field['type']), 'int')`
`1065`	`1065`	`) {`
`1066`	`1066`	`$field['auto_increment'] = ' AUTO_INCREMENT';`
`1067`	`1067`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField`
`184`	`184`	`protected function _attributeAutoIncrement(array &$attributes, array &$field)`
`185`	`185`	`{`
`186`	`186`	`if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true`
`187`		`- && stripos($field['type'], 'NUMBER') !== false`
	`187`	`+ && str_contains(strtolower($field['type']), 'number')`
`188`	`188`	`&& version_compare($this->db->getVersion(), '12.1', '>=')`
`189`	`189`	`) {`
`190`	`190`	`$field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string`
`154`	`154`	`protected function _attributeType(array &$attributes)`
`155`	`155`	`{`
`156`	`156`	`// Reset field lengths for data types that don't support it`
`157`		`- if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {`
	`157`	`+ if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {`
`158`	`158`	`$attributes['CONSTRAINT'] = null;`
`159`	`159`	`}`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string`
`360`	`360`	`protected function _attributeType(array &$attributes)`
`361`	`361`	`{`
`362`	`362`	`// Reset field lengths for data types that don't support it`
`363`		`- if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {`
	`363`	`+ if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {`
`364`	`364`	`$attributes['CONSTRAINT'] = null;`
`365`	`365`	`}`
`366`	`366`
`@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)`
`412`	`412`	`*/`
`413`	`413`	`protected function _attributeAutoIncrement(array &$attributes, array &$field)`
`414`	`414`	`{`
`415`		`- if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {`
	`415`	`+ if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {`
`416`	`416`	`$field['auto_increment'] = ' IDENTITY(1,1)';`
`417`	`417`	`}`
`418`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s`
`49`	`49`
`50`	`50`	`$attributes = stringify_attributes($attributes);`
`51`	`51`
`52`		`- if (stripos($attributes, 'method=') === false) {`
	`52`	`+ if (! str_contains(strtolower($attributes), 'method=')) {`
`53`	`53`	`$attributes .= ' method="post"';`
`54`	`54`	`}`
`55`		`- if (stripos($attributes, 'accept-charset=') === false) {`
	`55`	`+ if (! str_contains(strtolower($attributes), 'accept-charset=')) {`
`56`	`56`	`$config = config(App::class);`
`57`	`57`	`$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';`
`58`	`58`	`}`
`@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s`
`62`	`62`	`// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites`
`63`	`63`	`$before = service('filters')->getFilters()['before'];`
`64`	`64`
`65`		`- if ((in_array('csrf', $before, true) \|\| array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {`
	`65`	`+ if ((in_array('csrf', $before, true) \|\| array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {`
`66`	`66`	`$form .= csrf_field($csrfId ?? null);`
`67`	`67`	`}`
`68`	`68`
`@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`// Unsets default rows and cols if defined in extra field as array or string.`
`226`		`- if ((is_array($extra) && array_key_exists('rows', $extra)) \|\| (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {`
	`226`	`+ if ((is_array($extra) && array_key_exists('rows', $extra)) \|\| (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {`
`227`	`227`	`unset($defaults['rows']);`
`228`	`228`	`}`
`229`	`229`
`230`		`- if ((is_array($extra) && array_key_exists('cols', $extra)) \|\| (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {`
	`230`	`+ if ((is_array($extra) && array_key_exists('cols', $extra)) \|\| (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {`
`231`	`231`	`unset($defaults['cols']);`
`232`	`232`	`}`
`233`	`233`
`@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],`
`248`	`248`	`{`
`249`	`249`	`$extra = stringify_attributes($extra);`
`250`	`250`
`251`		`- if (stripos($extra, 'multiple') === false) {`
	`251`	`+ if (! str_contains(strtolower($extra), strtolower('multiple'))) {`
`252`	`252`	`$extra .= ' multiple="multiple"';`
`253`	`253`	`}`
`254`	`254`
`@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`$extra = stringify_attributes($extra);`
`308`		`- $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';`
	`308`	`+ $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';`
`309`	`309`	`$form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";`
`310`	`310`
`311`	`311`	`foreach ($options as $key => $val) {`
Original file line number	Diff line number	Diff line change
`@@ -380,12 +380,12 @@ protected function guessFormatter($field): string`
`380`	`380`
`381`	`381`	`// Check some common partials`
`382`	`382`	`foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {`
`383`		`- if (stripos($field, $term) !== false) {`
	`383`	`+ if (str_contains(strtolower($field), strtolower($term))) {`
`384`	`384`	`return $term;`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`
`388`		`- if (stripos($field, 'phone') !== false) {`
	`388`	`+ if (str_contains(strtolower($field), 'phone')) {`
`389`	`389`	`return 'phoneNumber';`
`390`	`390`	`}`
`391`	`391`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void`
`96`	`96`
`97`	`97`	`$this->config->handler = 'dummy';`
`98`	`98`
`99`		`- if (stripos('win', php_uname()) === 0) {`
`100`		`- $this->assertTrue(true); // can't test properly if we are on Windows`
	`99`	`+ if (is_windows()) {`
	`100`	`+ $this->markTestSkipped('Cannot test this properly on Windows.');`
`101`	`101`	`} else {`
`102`	`102`	`$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function testDetermineCodes(): void`
`124`	`124`	`$this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404)));`
`125`	`125`	`$this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('This.', 167)));`
`126`	`126`	`$this->assertSame([500, EXIT_CONFIG], $determineCodes(new ConfigException('This.')));`
`127`		`- $this->assertSame([500, EXIT_CONFIG], $determineCodes(new CastException('This.')));`
	`127`	`+ $this->assertSame([500, EXIT_CONFIG], $determineCodes(CastException::forInvalidInterface('This.')));`
`128`	`128`	`$this->assertSame([500, EXIT_DATABASE], $determineCodes(new DatabaseException('This.')));`
`129`	`129`	`}`
`130`	`130`