Merge branch 'develop' into patch-1

Author: AlexRasch

.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

@@ -174,7 +174,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,
 
         AssertFuncCallToPHPUnitAssertRector::class => [

rector.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

@@ -629,7 +629,7 @@ public function getTotalSegments(): int
     /**
      * Formats the URI as a string.
      *
-     * Warning: For backwards-compatability this method
+     * Warning: For backwards-compatibility this method
      * assumes URIs with the same host as baseURL should
      * be relative to the project's configuration.
      * This aspect of __toString() is deprecated and should be avoided.

system/HTTP/URI.php

@@ -246,7 +246,7 @@ Routing
 Negotiator
 ==========
 
-- Added a feature flag ``Feature::$strictLocaleNegotiation`` to enable strict locale comparision.
+- Added a feature flag ``Feature::$strictLocaleNegotiation`` to enable strict locale comparison.
   Previously, response with language headers ``Accept-language: en-US,en-GB;q=0.9`` returned the first allowed language ``en`` could instead of the exact language ``en-US`` or ``en-GB``.
   Set the value to ``true`` to enable comparison not only by language code ('en' - ISO 639-1) but also by regional code ('en-US' - ISO 639-1 plus ISO 3166-1 alpha).