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

# Conflicts:
#	system/Autoloader/Autoloader.php
#	system/Common.php
#	tests/system/Commands/CommandTest.php
#	tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
#	tests/system/Debug/ExceptionsTest.php
#	utils/phpstan-baseline/loader.neon
#	utils/phpstan-baseline/missingType.iterableValue.neon

Author: michalsn

.gitattributes

@@ -27,7 +27,7 @@ phpmetrics.json              export-ignore
 phpstan-baseline.php         export-ignore
 phpstan-bootstrap.php        export-ignore
 phpstan.neon.dist            export-ignore
-phpunit.xml.dist             export-ignore
+phpunit.dist.xml             export-ignore
 psalm-baseline.xml           export-ignore
 psalm.xml                    export-ignore
 psalm_autoload.php           export-ignore

.github/labeler.yml

@@ -10,14 +10,14 @@
   - any-glob-to-any-file:
     - '.github/workflows/*'
 
-# Add the `documentation` label to PRs that change any file in the `user_guide_src/source/` directory.
+# Add the `documentation` label to PRs for documentation only.
 'documentation':
 - changed-files:
   - any-glob-to-all-files:
-    - 'user_guide_src/source/*'
+    - 'user_guide_src/source/**'
 
-# Add the `testing` label to PRs that change files in the `tests/` directory ONLY.
+# Add the `testing` label to PRs that changes tests only.
 'testing':
 - changed-files:
   - any-glob-to-all-files:
-    - 'tests/*'
+    - 'tests/**'

.github/scripts/random-tests-config.txt

@@ -16,13 +16,13 @@ CLI
 # Commands
 # Config
 Cookie
-DataCaster
+# DataCaster
 # DataConverter
 # Database
-Debug
-Email
-Encryption
-Entity
+# Debug
+# Email
+# Encryption
+# Entity
 Events
 Files
 # Filters
@@ -31,7 +31,7 @@ Format
 # Helpers
 # Honeypot
 HotReloader
-I18n
+# I18n
 # Images
 Language
 Log

.github/workflows/deploy-distributables.yml

@@ -72,7 +72,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -126,7 +126,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -190,7 +190,7 @@ jobs:
         run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |

.github/workflows/label-pr.yml

@@ -7,13 +7,55 @@ on:
   - pull_request_target
 
 jobs:
+  validate-source:
+    permissions:
+      contents: read
+      pull-requests: read
+    runs-on: ubuntu-24.04
+    outputs:
+      valid: ${{ steps.check.outputs.valid }}
+
+    steps:
+      - name: Check if PR is from the main repository
+        id: check
+        run: |
+          if [[ "$HEAD_REPO" == "codeigniter4/CodeIgniter4" ]]; then
+            echo "valid=true" >> $GITHUB_OUTPUT
+          else
+            echo "valid=false" >> $GITHUB_OUTPUT
+          fi
+        env:
+          HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+
   add-labels:
+    needs: validate-source
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-24.04
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Verify PR source for workflow file changes
+        run: |
+          # Get changed files in this PR
+          git fetch origin "refs/pull/${{ github.event.pull_request.number }}/merge"
+          CHANGED_FILES=$(git diff --name-only origin/develop FETCH_HEAD 2>/dev/null || echo "")
+
+          # Check if this workflow file is being modified
+          if echo "$CHANGED_FILES" | grep -q "\.github/workflows/label-pr\.yml"; then
+            if [[ "$IS_VALID" != "true" ]]; then
+              echo "::error::Changes to label-pr.yml can only be made from the main repository."
+              exit 1
+            fi
+          fi
+        env:
+          IS_VALID: ${{ needs.validate-source.outputs.valid }}
+
       - name: Add labels
         uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
         with:

.gitignore

@@ -127,6 +127,6 @@ _modules/*
 .vscode/
 
 /results/
-/phpunit*.xml
+/phpunit.xml
 
 /.php-cs-fixer.php

admin/framework/.gitignore

@@ -123,4 +123,4 @@ _modules/*
 .vscode/
 
 /results/
-/phpunit*.xml
+/phpunit.xml

admin/framework/phpunit.xml.dist admin/framework/phpunit.dist.xmladmin/framework/phpunit.xml.dist renamed to admin/framework/phpunit.dist.xml

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="system/Test/bootstrap.php"
     backupGlobals="false"
     beStrictAboutOutputDuringTests="true"
     colors="true"
     columns="max"
     failOnRisky="true"
     failOnWarning="true"
-    cacheDirectory="build/.phpunit.cache">
-    <coverage
-        includeUncoveredFiles="true"
-        pathCoverage="false"
-        ignoreDeprecatedCodeUnits="true"
-        disableCodeCoverageIgnore="true">
+    cacheDirectory="build/.phpunit.cache"
+>
+    <coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true">
         <report>
             <clover outputFile="build/logs/clover.xml"/>
             <html outputDirectory="build/logs/html"/>
             <php outputFile="build/logs/coverage.serialized"/>
             <text outputFile="php://stdout" showUncoveredFiles="false"/>
         </report>
     </coverage>
+
     <testsuites>
         <testsuite name="App">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
+
     <logging>
         <testdoxHtml outputFile="build/logs/testdox.html"/>
         <testdoxText outputFile="build/logs/testdox.txt"/>
         <junit outputFile="build/logs/logfile.xml"/>
     </logging>
+
     <source>
         <include>
             <directory suffix=".php">./app</directory>
@@ -41,6 +41,7 @@
             <file>./app/Config/Routes.php</file>
         </exclude>
     </source>
+
     <php>
         <server name="app.baseURL" value="http://example.com/"/>
         <server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/>

admin/starter/.gitignore

@@ -123,4 +123,4 @@ _modules/*
 .vscode/
 
 /results/
-/phpunit*.xml
+/phpunit.xml

admin/starter/phpunit.xml.dist admin/starter/phpunit.dist.xmladmin/starter/phpunit.xml.dist renamed to admin/starter/phpunit.dist.xml

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
     backupGlobals="false"
     beStrictAboutOutputDuringTests="true"
     colors="true"
     columns="max"
     failOnRisky="true"
     failOnWarning="true"
-    cacheDirectory="build/.phpunit.cache">
-    <coverage
-        includeUncoveredFiles="true"
-        pathCoverage="false"
-        ignoreDeprecatedCodeUnits="true"
-        disableCodeCoverageIgnore="true">
+    cacheDirectory="build/.phpunit.cache"
+>
+    <coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true">
         <report>
             <clover outputFile="build/logs/clover.xml"/>
             <html outputDirectory="build/logs/html"/>
             <php outputFile="build/logs/coverage.serialized"/>
             <text outputFile="php://stdout" showUncoveredFiles="false"/>
         </report>
     </coverage>
+
     <testsuites>
         <testsuite name="App">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
+
     <logging>
         <testdoxHtml outputFile="build/logs/testdox.html"/>
         <testdoxText outputFile="build/logs/testdox.txt"/>
         <junit outputFile="build/logs/logfile.xml"/>
     </logging>
+
     <source>
         <include>
             <directory suffix=".php">./app</directory>
@@ -41,6 +41,7 @@
             <file>./app/Config/Routes.php</file>
         </exclude>
     </source>
+
     <php>
         <server name="app.baseURL" value="http://example.com/"/>
         <server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/>