Merge pull request #9358 from codeigniter4/develop

4.5.7 Ready code

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: CodeIgniter Forum
     url: https://forum.codeigniter.com/forum-30.html
-    about: Please ask your support questions in the forums. Thanks!
+    about: Please ask your support questions and/or feature requests in the forums. Thanks!
 
   - name: CodeIgniter Slack channel
     url: https://codeigniterchat.slack.com

.github/ISSUE_TEMPLATE/planned-work.md

@@ -1,10 +1,10 @@
 ---
 name: Planned work
-about: Approved work planning
+about: Maintainers' space. DO NOT use this for your bug reports!
 title: 'Dev: '
 labels: dev
 assignees: ''
 
 ---
 
-Repo maintainers will create "issues" for planned work, so it can be tracked.
+Maintainers will create "issues" for planned work, so it can be tracked.

.github/mergeable.yml

@@ -0,0 +1,41 @@
+# https://mergeable.readthedocs.io/en/latest/configuration.html
+
+version: 2
+mergeable:
+  - when: issues.opened
+    validate:
+      - do: description
+        and:
+          - must_include:
+              regex: '^### PHP Version'
+          - must_include:
+              regex: '^### CodeIgniter4 Version'
+      - do: author
+        and:
+          - must_exclude:
+              regex: 'kenjis'
+          - must_exclude:
+              regex: 'lonnieezell'
+          - must_exclude:
+              regex: 'MGatner'
+          - must_exclude:
+              regex: 'michalsn'
+          - must_exclude:
+              regex: 'paulbalandan'
+          - must_exclude:
+              regex: 'samsonasik'
+    fail:
+      - do: comment
+        payload: |
+          Hi there! :wave:
+
+          It looks like you opened an issue without following the bug report template:
+
+          Bug report ([open an issue](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+))
+
+          If you are opening a feature request or support question, please do so in the [forums](https://forum.codeigniter.com/forum-30.html).
+
+          The current issue will be closed. This is a precaution to save maintainers' time, I hope you'll understand.
+
+          Sincerely, the mergeable bot 🤖
+      - do: close

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v4.5.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.7) (2024-12-31)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.6...v4.5.7)
+
+### Fixed Bugs
+
+* fix: handle namespaced helper found on Common helper by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9354
+* fix: `Forge::dropColumn()` always returns `false` on SQLite3 driver by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/9351
+
+### Refactoring
+
+* refactor: enable AddArrowFunctionReturnTypeRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9343
+
 ## [v4.5.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.6) (2024-12-28)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.5...v4.5.6)
 

app/Views/errors/cli/error_exception.php

@@ -50,7 +50,7 @@
             $function .= $padClass . $error['function'];
         }
 
-        $args = implode(', ', array_map(static fn ($value) => match (true) {
+        $args = implode(', ', array_map(static fn ($value): string => match (true) {
             is_object($value) => 'Object(' . $value::class . ')',
             is_array($value)  => $value !== [] ? '[...]' : '[]',
             $value === null   => 'null', // return the lowercased version

phpdoc.dist.xml

@@ -10,7 +10,7 @@
         <output>api/build/</output>
         <cache>api/cache/</cache>
     </paths>
-    <version number="4.5.6">
+    <version number="4.5.7">
         <api format="php">
             <source dsn=".">
                 <path>system</path>

rector.php

@@ -41,6 +41,7 @@
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
@@ -201,6 +202,7 @@
         TypedPropertyFromAssignsRector::class,
         ClosureReturnTypeRector::class,
         FlipTypeControlToUseExclusiveTypeRector::class,
+        AddArrowFunctionReturnTypeRector::class,
     ])
     ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
         // keep '\\' prefix string on string '\Foo\Bar'

system/CLI/CLI.php

@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
             $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));
 
             // separate input by comma and convert all to an int[]
-            $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
+            $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
             // find max from key of $options
             $maxOptions = array_key_last($options);
             // find max from input

system/CodeIgniter.php

@@ -56,7 +56,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.5.6';
+    public const CI_VERSION = '4.5.7';
 
     /**
      * App startup time.

system/Commands/Utilities/Routes.php

@@ -187,7 +187,7 @@ public function run(array $params)
 
         // Sort by Handler.
         if ($sortByHandler) {
-            usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
+            usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
         }
 
         if ($host !== null) {

system/Common.php

@@ -598,7 +598,7 @@ function helper($filenames): void
             if (str_contains($filename, '\\')) {
                 $path = $loader->locateFile($filename, 'Helpers');
 
-                if ($path !== '') {
+                if ($path === false) {
                     throw FileNotFoundException::forFileNotFound($filename);
                 }
 

system/Database/BaseBuilder.php

@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
+                    static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
                         ' = ' . $value :
                         ' = VALUES(' . $value . ')'),
                     array_keys($updateFields),
@@ -2108,7 +2108,7 @@ public function onConstraint($set)
             if (is_string($set)) {
                 $set = explode(',', $set);
 
-                $set = array_map(static fn ($key) => trim($key), $set);
+                $set = array_map(static fn ($key): string => trim($key), $set);
             }
 
             if ($set instanceof RawSql) {
@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
         if (is_string($query)) {
             if ($columns !== null && is_string($columns)) {
                 $columns = explode(',', $columns);
-                $columns = array_map(static fn ($key) => trim($key), $columns);
+                $columns = array_map(static fn ($key): string => trim($key), $columns);
             }
 
             $columns = (array) $columns;
@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
      */
     protected function formatValues(array $values): array
     {
-        return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
+        return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
     }
 
     /**
@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $key . ($value instanceof RawSql ?
+                    static fn ($key, $value): string => $key . ($value instanceof RawSql ?
                         ' = ' . $value :
                         ' = ' . $alias . '.' . $value),
                     array_keys($updateFields),
@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),
@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),

system/Database/Forge.php

@@ -778,7 +778,7 @@ public function addColumn(string $table, $fields): bool
     }
 
     /**
-     * @param array|string $columnNames column names to DROP
+     * @param list<string>|string $columnNames column names to DROP
      *
      * @return bool
      *
@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
                 $columnNamesToDrop = explode(',', $columnNamesToDrop);
             }
 
-            $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
+            $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 
             return $sql . implode(', ', $columnNamesToDrop);
         }

system/Database/MySQLi/Builder.php

@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
+                    static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
                         ' = ' . $value :
                         ' = ' . $alias . '.' . $value),
                     array_keys($updateFields),
@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),

system/Database/OCI8/Builder.php

@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " FROM DUAL UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),
@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
-        $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
+        $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);
 
         $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
             $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string
 
         $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
 
-        $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
+        $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));
 
         $sql .= ' FROM DUAL) "_replace" ON ( ';
 
         $onList   = [];
         $onList[] = '1 != 1';
 
         foreach ($uniqueIndexes as $index) {
-            $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
+            $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
         }
 
         $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';
 
-        $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
+        $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 
         $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';
 
-        return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
+        return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
     }
 
     /**
@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
+                    static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
                     ' = ' . $value :
                     ' = ' . $alias . '.' . $value),
                     array_keys($updateFields),
@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )) . ' FROM DUAL',
@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $constraints = $this->QBOptions['constraints'] ?? [];
 
             if (empty($constraints)) {
-                $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
+                $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);
 
                 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
                     $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $key . ($value instanceof RawSql ?
+                    static fn ($key, $value): string => $key . ($value instanceof RawSql ?
                     " = {$value}" :
                     " = {$alias}.{$value}"),
                     array_keys($updateFields),
@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";
 
             $sql .= (' ('
-                . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
+                . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
                 . ')');
 
             $this->QBOptions['sql'] = $sql;
@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " FROM DUAL UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),
@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $data = implode(
                 " FROM DUAL UNION ALL\n",
                 array_map(
-                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
+                    static fn ($value): string => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index): string => $index . ' ' . $key,
                         $keys,
                         $value
                     )),

system/Database/OCI8/Result.php

@@ -37,7 +37,7 @@ public function getFieldCount(): int
      */
     public function getFieldNames(): array
     {
-        return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
+        return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
     }
 
     /**