Merge pull request #8723 from codeigniter4/develop

4.5.0 Ready code

Author: kenjis

.github/workflows/deploy-userguide-latest.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           coverage: none
 
       # Build the latest User Guide

.github/workflows/reusable-coveralls.yml

@@ -63,6 +63,8 @@ jobs:
           vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
 
       - name: Upload coverage to Coveralls
-        run: vendor/bin/php-coveralls --verbose --exclude-no-stmt --ansi
+        run: |
+          composer global require php-coveralls/php-coveralls
+          php-coveralls --verbose --exclude-no-stmt --ansi
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-coding-standards.yml

@@ -28,8 +28,8 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
+          - '8.1'
+          - '8.2'
 
     steps:
       - name: Checkout

.github/workflows/test-phpcpd.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phpcpd
           extensions: dom, mbstring
 
@@ -57,4 +57,6 @@ jobs:
             --exclude system/Debug/Exceptions.php
             --exclude system/HTTP/SiteURI.php
             --exclude system/Validation/Rules.php
+            --exclude system/Autoloader/Autoloader.php
+            --exclude system/Config/Filters.php
             -- app/ public/ system/

.github/workflows/test-phpunit.yml

@@ -47,7 +47,7 @@ jobs:
     steps:
       - id: coverage-php-version
         run: |
-          echo "version=8.1" >> $GITHUB_OUTPUT
+          echo "version=8.2" >> $GITHUB_OUTPUT
 
   sanity-tests:
     name: Others
@@ -56,8 +56,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'
@@ -87,8 +85,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'
@@ -101,7 +97,7 @@ jobs:
         mysql-version:
           - '8.0'
         include:
-          - php-version: '7.4'
+          - php-version: '8.1'
             db-platform: MySQLi
             mysql-version: '5.7'
           - php-version: '8.3'
@@ -130,8 +126,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'
@@ -160,8 +154,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'

.github/workflows/test-rector.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.1', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -126,5 +126,6 @@ nb-configuration.xml
 /results/
 /phpunit*.xml
 /.phpunit.*.cache
+/.phpunit.cache
 
 /.php-cs-fixer.php

.php-cs-fixer.dist.php

@@ -56,13 +56,10 @@
     '[email protected]'
 );
 
-// @TODO: remove this check when support for PHP 7.4 is dropped
-if (PHP_VERSION_ID >= 80000) {
-    $config
-        ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
-        ->setRules(array_merge($config->getRules(), [
-            NoCodeSeparatorCommentFixer::name() => true,
-        ]));
-}
+$config
+    ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
+    ->setRules(array_merge($config->getRules(), [
+        NoCodeSeparatorCommentFixer::name() => true,
+    ]));
 
 return $config;

.php-cs-fixer.no-header.php

@@ -38,13 +38,10 @@
 
 $config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
 
-// @TODO: remove this check when support for PHP 7.4 is dropped
-if (PHP_VERSION_ID >= 80000) {
-    $config
-        ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
-        ->setRules(array_merge($config->getRules(), [
-            NoCodeSeparatorCommentFixer::name() => true,
-        ]));
-}
+$config
+    ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
+    ->setRules(array_merge($config->getRules(), [
+        NoCodeSeparatorCommentFixer::name() => true,
+    ]));
 
 return $config;

.php-cs-fixer.user-guide.php

@@ -48,13 +48,10 @@
 
 $config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
 
-// @TODO: remove this check when support for PHP 7.4 is dropped
-if (PHP_VERSION_ID >= 80000) {
-    $config
-        ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
-        ->setRules(array_merge($config->getRules(), [
-            NoCodeSeparatorCommentFixer::name() => true,
-        ]));
-}
+$config
+    ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
+    ->setRules(array_merge($config->getRules(), [
+        NoCodeSeparatorCommentFixer::name() => true,
+    ]));
 
 return $config;