chore: officially support PHP 8.3 (#7466)

PHP-CS-Fixer · Nov 26, 2023 · 45a4530 · 45a4530
1 parent d50d5b6
commit 45a4530
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 75 deletions.
diff --git a/.github/composite-actions/install-composer-deps/action.yml b/.github/composite-actions/install-composer-deps/action.yml
@@ -45,7 +45,7 @@ runs:
           Composer-${{ runner.os }}-
 
     - name: Auto-add ignore-platform-req
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       id: resolve-ignore-platform-req
       with:
         script: 'return ${{ env.PHP_VERSION_ID }} >= 80300 ? "--ignore-platform-req=php+" : ""'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PHP_MAX: '8.2'
+  PHP_MAX: '8.3'
   PHP_MIN: '7.4'
 
 jobs:
@@ -68,67 +68,77 @@ jobs:
             run-tests: 'yes'
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '8.2'
+            php-version: '8.3'
+            job-description: 'Fixer'
+            run-fixer: 'yes'
+
+          - operating-system: 'ubuntu-20.04'
+            php-version: '8.3'
+            job-description: 'tests'
+            run-tests: 'yes'
+
+          - operating-system: 'ubuntu-20.04'
+            php-version: '8.3'
             job-description: 'Fixer with migration rules'
             run-fixer: 'yes'
             run-migration-rules: 'yes' # should be checked on the highest supported PHP version
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'tests with migration rules'
             run-tests: 'yes'
             run-migration-rules: 'yes' # should be checked on the highest supported PHP version
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'Fixer with Symfony ^7'
             run-fixer: 'yes'
             execute-flex-with-symfony-version: '^7' # explicit check for Symfony 7.x compatibility
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'tests with Symfony ^7'
             run-tests: 'yes'
             execute-flex-with-symfony-version: '^7' # explicit check for Symfony 7.x compatibility
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'code coverage'
             run-tests: 'yes'
             collect-code-coverage: 'yes'
 
           - operating-system: 'windows-latest'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'Fixer on Windows'
             run-fixer: 'yes'
             FAST_LINT_TEST_CASES: 1 # we need full syntax check on one job at least, no need to do it on additional
 
           - operating-system: 'windows-latest'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'tests on Windows'
             run-tests: 'yes'
             FAST_LINT_TEST_CASES: 1 # we need full syntax check on one job at least, no need to do it on additional systems
 
           - operating-system: 'macos-latest'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'Fixer on macOS'
             run-fixer: 'yes'
             FAST_LINT_TEST_CASES: 1 # we need full syntax check on one job at least, no need to do it on additional systems
 
           - operating-system: 'macos-latest'
-            php-version: '8.2'
+            php-version: '8.3'
             job-description: 'tests on macOS'
             run-tests: 'yes'
             FAST_LINT_TEST_CASES: 1 # we need full syntax check on one job at least, no need to do it on additional
 
           - operating-system: 'ubuntu-22.04'
-            php-version: '8.3'
+            php-version: '8.4'
             job-description: 'Fixer'
             run-fixer: 'yes'
             PHP_CS_FIXER_IGNORE_ENV: 1
 
           - operating-system: 'ubuntu-22.04'
-            php-version: '8.3'
+            php-version: '8.4'
             job-description: 'tests'
             run-tests: 'yes'
             PHP_CS_FIXER_IGNORE_ENV: 1

diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml
@@ -19,7 +19,7 @@ jobs:
         operating-system:
           - ubuntu-20.04
         php-version:
-          - 8.2
+          - 8.3
 
     name: Static Code Analysis
 

diff --git a/.php-cs-fixer.php-highest.php b/.php-cs-fixer.php-highest.php
@@ -12,8 +12,8 @@
  * with this source code in the file LICENSE.
  */
 
-if (PHP_VERSION_ID < 8_02_00 || PHP_VERSION_ID >= 8_03_00) {
-    fwrite(STDERR, "PHP CS Fixer's config for PHP-HIGHEST can be executed only on highest supported PHP version - 8.2.*.\n");
+if (PHP_VERSION_ID < 8_03_00 || PHP_VERSION_ID >= 8_04_00) {
+    fwrite(STDERR, "PHP CS Fixer's config for PHP-HIGHEST can be executed only on highest supported PHP version - 8.3.*.\n");
     fwrite(STDERR, "Running it on lower PHP version would prevent calling migration rules.\n");
 
     exit(1);
@@ -22,7 +22,7 @@
 $config = require __DIR__.'/.php-cs-fixer.dist.php';
 
 $config->setRules(array_merge($config->getRules(), [
-    '@PHP82Migration' => true,
+    '@PHP83Migration' => true,
     '@PHP80Migration:risky' => true,
 ]));
 

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ projects. This tool does not only detect them, but also fixes them for you.
 * PHP 8.0 (except PHP 8.0.0 due to [bug in PHP tokenizer](https://bugs.php.net/bug.php?id=80462))
 * PHP 8.1
 * PHP 8.2
+* PHP 8.3
 
 > **Note**
 > Each new PHP version requires a huge effort to support the new syntax.

diff --git a/compose.yaml b/compose.yaml
@@ -40,5 +40,5 @@ services:
     <<: *php
     build:
       args:
-        PHP_VERSION: "8.3.0RC6"
+        PHP_VERSION: "8.3"
         PHP_XDEBUG_VERSION: "3.3.0alpha3"
diff --git a/dev-tools/build.sh b/dev-tools/build.sh
@@ -22,4 +22,5 @@ dev-tools/bin/box compile
 
 # revert changes to composer
 git checkout composer.json
-composer update --optimize-autoloader --no-interaction --no-progress --no-scripts -q
+PHP83HACK=--ignore-platform-req=PHP+ # for building on local machine
+composer update --optimize-autoloader --no-interaction --no-progress --no-scripts -q $PHP83HACK
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ergebnis/composer-normalize": "^2.39.0",
         "jangregor/phpstan-prophecy": "^1.0.0",
         "maglnet/composer-require-checker": "^4.7.1",
@@ -19,7 +19,7 @@
         },
         "optimize-autoloader": true,
         "platform": {
-            "php": "8.2"
+            "php": "8.3"
         },
         "prefer-stable": true,
         "sort-packages": true