Merge branch 'codeigniter4:develop' into fix-routing

codeigniter4 · Sep 14, 2023 · 00b4aff · 00b4aff
2 parents e3e7a0e + e420c03
commit 00b4aff
Show file tree

Hide file tree

Showing 26 changed files with 744 additions and 100 deletions.
diff --git a/.github/workflows/label-conflict.yml b/.github/workflows/label-conflict.yml
@@ -0,0 +1,37 @@
+name: Auto Label Conflicts
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  auto-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: prince-chrismc/label-merge-conflicts-action@v3
+        with:
+          conflict_label_name: 'stale'
+          github_token: ${{ github.token }}
+
+          # --- Optional Inputs ---
+          # To make sure the merge commit exactly matches the branch
+          detect_merge_changes: true # or true to handle as conflicts
+          # By default a comment will be left, adding `conflict_comment: ''` will disable comments
+          # The optional `${author}` will be replaced with the username of the pull request
+          conflict_comment: |
+            :wave: Hi, @${author},
+
+            We detected conflicts in your PR against the base branch :speak_no_evil:
+            You may want to sync :arrows_counterclockwise: your branch with upstream!
+
+            Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch
diff --git a/.github/workflows/label-signing.yml b/.github/workflows/label-signing.yml
@@ -0,0 +1,32 @@
+name: Check Signed PR
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  build:
+    name: Check Signed Commit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check signed commits in PR
+        uses: 1Password/check-signed-commits-action@v1
+        with:
+          comment: |
+            You must GPG-sign your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. See Developer's Certificate of Origin. See [signing][1].
+
+            **Note that all your commits must be signed.** If you have an unsigned commit, you can sign the previous commits by referring to [gpg-signing-old-commits][2].
+            [1]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing
+            [2]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
@@ -59,6 +59,10 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+        include:
+          - php-version: '8.3'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -70,6 +74,7 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: imagick, redis, memcached
+      extra-composer-options: ${{ matrix.composer-option }}
 
   database-live-tests:
     needs:
@@ -84,6 +89,7 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
         db-platform:
           - MySQLi
           - OCI8
@@ -96,6 +102,8 @@ jobs:
           - php-version: '7.4'
             db-platform: MySQLi
             mysql-version: '8.0'
+          - php-version: '8.3'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -109,6 +117,7 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
+      extra-composer-options: ${{ matrix.composer-option }}
 
   separate-process-tests:
     needs:
@@ -122,6 +131,10 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+        include:
+          - php-version: '8.3'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -133,6 +146,7 @@ jobs:
       enable-coverage: true # needs xdebug for assertHeaderEmitted() tests
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
+      extra-composer-options: ${{ matrix.composer-option }}
 
   cache-live-tests:
     needs:
@@ -146,6 +160,10 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+        include:
+          - php-version: '8.3'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -157,6 +175,7 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: redis, memcached
+      extra-composer-options: ${{ matrix.composer-option }}
 
   coveralls:
     name: Upload coverage results to Coveralls

diff --git a/README.md b/README.md
@@ -91,6 +91,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)
 
+> **Warning**
+> The end of life date for PHP 7.4 was November 28, 2022. If you are
+> still using PHP 7.4, you should upgrade immediately. The end of life date
+> for PHP 8.0 will be November 26, 2023.
+
 Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)

diff --git a/admin/css/debug-toolbar/_theme-dark.scss b/admin/css/debug-toolbar/_theme-dark.scss
@@ -150,6 +150,10 @@
         .timer {
             background-color: $g-orange;
         }
+
+        .timeline-parent-open td {
+            color: $t-dark;
+        }
     }
 }
 

diff --git a/admin/framework/.gitignore b/admin/framework/.gitignore
@@ -61,6 +61,7 @@ writable/uploads/*
 !writable/uploads/index.html
 
 writable/debugbar/*
+!writable/debugbar/.gitkeep
 
 php_errors.log
 

diff --git a/admin/framework/README.md b/admin/framework/README.md
@@ -47,6 +47,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)
 
+> **Warning**
+> The end of life date for PHP 7.4 was November 28, 2022. If you are
+> still using PHP 7.4, you should upgrade immediately. The end of life date
+> for PHP 8.0 will be November 26, 2023.
+
 Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)

diff --git a/admin/starter/.gitignore b/admin/starter/.gitignore
@@ -61,6 +61,7 @@ writable/uploads/*
 !writable/uploads/index.html
 
 writable/debugbar/*
+!writable/debugbar/.gitkeep
 
 php_errors.log
 

diff --git a/admin/starter/README.md b/admin/starter/README.md
@@ -55,6 +55,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)
 
+> **Warning**
+> The end of life date for PHP 7.4 was November 28, 2022. If you are
+> still using PHP 7.4, you should upgrade immediately. The end of life date
+> for PHP 8.0 will be November 26, 2023.
+
 Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)

diff --git a/composer.json b/composer.json
@@ -19,19 +19,21 @@
     },
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
+        "codeigniter/phpstan-codeigniter": "^v1.1",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
         "php-coveralls/php-coveralls": "^2.5",
+        "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10.2",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.2",
+        "rector/rector": "0.18.3",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {
@@ -70,7 +72,8 @@
     },
     "config": {
         "allow-plugins": {
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "phpstan/extension-installer": true
         },
         "optimize-autoloader": true,
         "preferred-install": "dist",