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

Author: paulbalandan

.github/labeler.yml

@@ -0,0 +1,23 @@
+# https://github.com/actions/labeler?tab=readme-ov-file#usage
+
+# Add the `4.8` label to PRs that target the `4.8` branch.
+'4.8': # @todo change value whenever the next minor version is changed
+- base-branch: '4.8'
+
+# Add the `github_actions` label to PRs that change any file in the `.github/workflows/` directory.
+'github_actions':
+- changed-files:
+  - any-glob-to-any-file:
+    - '.github/workflows/*'
+
+# Add the `documentation` label to PRs that change any file in the `user_guide_src/source/` directory.
+'documentation':
+- changed-files:
+  - any-glob-to-all-files:
+    - 'user_guide_src/source/*'
+
+# Add the `testing` label to PRs that change files in the `tests/` directory ONLY.
+'testing':
+- changed-files:
+  - any-glob-to-all-files:
+    - 'tests/*'

.github/scripts/secure-git-push

@@ -8,8 +8,9 @@ on:
     branches:
       - 'develop'
     paths:
-      - 'system/**'
+      - '.github/scripts/secure-git-push'
       - '.github/workflows/deploy-apidocs.yml'
+      - 'system/**'
 
 permissions:
   contents: read
@@ -72,7 +73,11 @@ jobs:
           PUSH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
           git add .
+
           if ! git diff-index --quiet HEAD; then
             git commit -m "Updated API for commit ${GITHUB_SHA}"
-            bash ${GITHUB_WORKSPACE}/.github/scripts/secure-git-push https://github.com/codeigniter4/api.git HEAD:master
+            bash "${GITHUB_WORKSPACE}/source/.github/scripts/secure-git-push" https://github.com/codeigniter4/api.git HEAD:master
+            echo "API documentation deployed successfully."
+          else
+            echo "No changes to deploy."
           fi

.github/workflows/deploy-apidocs.yml

@@ -0,0 +1,20 @@
+name: Add Labels to PRs
+
+# NOTE: When updating this workflow, you should first change the event to `pull_request` to test the changes
+# in a PR, and then change it back to `pull_request_target` before merging.
+# @see https://github.com/actions/labeler?tab=readme-ov-file#updating-major-version-of-the-labeler
+on:
+  - pull_request_target
+
+jobs:
+  add-labels:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Add labels
+        uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+        with:
+          sync-labels: true # Remove labels when matching files are reverted

.github/workflows/label-pr.yml

@@ -6,7 +6,7 @@ The in-progress CI4 API docs, warts & all, are rebuilt and
 then copied to a nested
 repository clone (`build/api`), with the result
 optionally pushed to the `master` branch of the `api` repo.
-That would then be publically visible as the in-progress
+That would then be publicly visible as the in-progress
 version of the [API](https://codeigniter4.github.io/api/).
 
 ## Requirements

admin/apibot.md

@@ -5,7 +5,7 @@ Builds & deploys user guide.
 The in-progress CI4 user guide, warts & all, is rebuilt in a nested
 repository clone (`user_guide_src/build/html`), with the result
 optionally pushed to the `gh-pages` branch of the repo.
-That would then be publically visible as the in-progress
+That would then be publicly visible as the in-progress
 version of the [User Guide](https://codeigniter4.github.io/CodeIgniter4/).
 
 ## Requirements

admin/docbot.md

@@ -154,7 +154,7 @@
 
         CompactToVariablesRector::class,
 
-        // possibly isset() on purpose, on updated Config classes property accross versions
+        // possibly isset() on purpose, on updated Config classes property across versions
         IssetOnPropertyObjectToPropertyExistsRector::class,
 
         // some tests extended by other tests

rector.php

@@ -18,6 +18,10 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\I18n\Time;
 use Exception;
+use ReflectionClass;
+use ReflectionNamedType;
+use ReflectionType;
+use ReflectionUnionType;
 use stdClass;
 use Stringable;
 use Throwable;
@@ -60,6 +64,13 @@
  */
 abstract class BaseConnection implements ConnectionInterface
 {
+    /**
+     * Cached builtin type names per class/property.
+     *
+     * @var array<class-string, array<string, list<string>>>
+     */
+    private static array $propertyBuiltinTypesCache = [];
+
     /**
      * Data Source Name / Connect string
      *
@@ -384,9 +395,14 @@ public function __construct(array $params)
             unset($params['dateFormat']);
         }
 
+        $typedPropertyTypes = $this->getBuiltinPropertyTypesMap(array_keys($params));
+
         foreach ($params as $key => $value) {
             if (property_exists($this, $key)) {
-                $this->{$key} = $value;
+                $this->{$key} = $this->castScalarValueForTypedProperty(
+                    $value,
+                    $typedPropertyTypes[$key] ?? [],
+                );
             }
         }
 
@@ -404,6 +420,126 @@ public function __construct(array $params)
         }
     }
 
+    /**
+     * Some config values (especially env overrides without clear source type)
+     * can still reach us as strings. Coerce them for typed properties to keep
+     * strict typing compatible.
+     *
+     * @param list<string> $types
+     */
+    private function castScalarValueForTypedProperty(mixed $value, array $types): mixed
+    {
+        if (! is_string($value)) {
+            return $value;
+        }
+
+        if ($types === [] || in_array('string', $types, true) || in_array('mixed', $types, true)) {
+            return $value;
+        }
+
+        $trimmedValue = trim($value);
+
+        if (in_array('null', $types, true) && strtolower($trimmedValue) === 'null') {
+            return null;
+        }
+
+        if (in_array('int', $types, true) && preg_match('/^[+-]?\d+$/', $trimmedValue) === 1) {
+            return (int) $trimmedValue;
+        }
+
+        if (in_array('float', $types, true) && is_numeric($trimmedValue)) {
+            return (float) $trimmedValue;
+        }
+
+        if (in_array('bool', $types, true) || in_array('false', $types, true) || in_array('true', $types, true)) {
+            $boolValue = filter_var($trimmedValue, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+
+            if ($boolValue !== null) {
+                if (in_array('bool', $types, true)) {
+                    return $boolValue;
+                }
+
+                if ($boolValue === false && in_array('false', $types, true)) {
+                    return false;
+                }
+
+                if ($boolValue === true && in_array('true', $types, true)) {
+                    return true;
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param list<string> $properties
+     *
+     * @return array<string, list<string>>
+     */
+    private function getBuiltinPropertyTypesMap(array $properties): array
+    {
+        $className = static::class;
+        $requested = array_fill_keys($properties, true);
+
+        if (! isset(self::$propertyBuiltinTypesCache[$className])) {
+            self::$propertyBuiltinTypesCache[$className] = [];
+        }
+
+        // Fill only the properties requested by this call that are not cached yet.
+        $missing = array_diff_key($requested, self::$propertyBuiltinTypesCache[$className]);
+
+        if ($missing !== []) {
+            $reflection = new ReflectionClass($className);
+
+            foreach ($reflection->getProperties() as $property) {
+                $propertyName = $property->getName();
+
+                if (! isset($missing[$propertyName])) {
+                    continue;
+                }
+
+                $type = $property->getType();
+
+                if (! $type instanceof ReflectionType) {
+                    self::$propertyBuiltinTypesCache[$className][$propertyName] = [];
+
+                    continue;
+                }
+
+                $namedTypes   = $type instanceof ReflectionUnionType ? $type->getTypes() : [$type];
+                $builtinTypes = [];
+
+                foreach ($namedTypes as $namedType) {
+                    if (! $namedType instanceof ReflectionNamedType || ! $namedType->isBuiltin()) {
+                        continue;
+                    }
+
+                    $builtinTypes[] = $namedType->getName();
+                }
+
+                if ($type->allowsNull() && ! in_array('null', $builtinTypes, true)) {
+                    $builtinTypes[] = 'null';
+                }
+
+                self::$propertyBuiltinTypesCache[$className][$propertyName] = $builtinTypes;
+            }
+
+            // Untyped or unresolved properties are cached as empty to avoid re-reflecting them.
+            foreach (array_keys($missing) as $propertyName) {
+                self::$propertyBuiltinTypesCache[$className][$propertyName] ??= [];
+            }
+        }
+
+        $typedProperties = [];
+
+        foreach ($properties as $property) {
+            $typedProperties[$property] = self::$propertyBuiltinTypesCache[$className][$property] ?? [];
+        }
+
+        return $typedProperties;
+    }
+
     /**
      * Initializes the database connection/settings.
      *
@@ -445,10 +581,15 @@ public function initialize()
             if (! empty($this->failover) && is_array($this->failover)) {
                 // Go over all the failovers
                 foreach ($this->failover as $index => $failover) {
+                    $typedPropertyTypes = $this->getBuiltinPropertyTypesMap(array_keys($failover));
+
                     // Replace the current settings with those of the failover
                     foreach ($failover as $key => $val) {
                         if (property_exists($this, $key)) {
-                            $this->{$key} = $val;
+                            $this->{$key} = $this->castScalarValueForTypedProperty(
+                                $val,
+                                $typedPropertyTypes[$key] ?? [],
+                            );
                         }
                     }
 

system/Database/BaseConnection.php

@@ -321,7 +321,7 @@ private function getFullName(string $table): string
     }
 
     /**
-     * Add permision statements for index value inserts
+     * Add permission statements for index value inserts
      */
     private function addIdentity(string $fullTable, string $insert): string
     {

system/Database/SQLSRV/Builder.php

@@ -56,7 +56,7 @@ class Connection extends BaseConnection
      *
      * @see https://www.php.net/manual/en/sqlite3.busytimeout
      */
-    protected $busyTimeout;
+    protected ?int $busyTimeout = null;
 
     /**
      * The setting of the "synchronous" flag