feat: official support for php8.4 (#522)

jkowalleck · web-flow · commit 0a435c4236b1 · 2025-02-18T16:36:13.000+01:00
fixes #500 --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
diff --git a/.github/workflows/php-dev.yml b/.github/workflows/php-dev.yml
@@ -25,7 +25,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PHP_VERSION_LATEST: "8.3"
+  PHP_VERSION_LATEST: "8.4"
   PHP_PROJECT_EXT: dom,json,libxml  # via `composer info -pt`
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
       matrix:
         os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
         php:
-          - "8.3" # highest supported
+          - "8.4" # highest supported
           - "8.1" # lowest supported
     timeout-minutes: 30
     steps:
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -18,7 +18,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PHP_VERSION_LATEST: "8.3"
+  PHP_VERSION_LOWEST: "8.1"  # lowest supported
+  PHP_VERSION_LATEST: "8.4"  # highest supported
   PHP_PROJECT_EXT: dom,json,libxml  # via `composer info -pt`
   REPORTS_DIR: CI_reports
   TESTS_REPORTS_ARTIFACT: tests-reports
@@ -51,18 +52,19 @@ jobs:
       matrix:
         os: [ "ubuntu-latest" ]
         php:
-          - "8.3" # highest supported
+          - "8.4" # highest supported
+          - "8.3"
           - "8.2"
           - "8.1" # lowest supported
         dependencies: [ "lowest", "highest" ]
         include:
           - # Windows highest
             os: windows-latest
-            php: "8.3"
+            php: "8.4"
             dependencies: "highest"
           - # MacOS highest
             os: macos-latest
-            php: "8.3"
+            php: "8.4"
             dependencies: "highest"
     timeout-minutes: 30
     steps:
@@ -103,7 +105,6 @@ jobs:
           # removing security-foo here is fine, as no code is run, only parsed
           composer remove --dev 'roave/security-advisories' \
              --no-update --no-install
-          composer config platform.php ${{ matrix.php }}
           composer update \
             --no-interaction --no-progress \
             --prefer-dist \
@@ -160,7 +161,7 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - "8.3"  # highest supported
+          - "8.4"  # highest supported
           - "8.1"  # lowest supported
         composer:
           - "v2"   # latest 2.x
@@ -171,10 +172,14 @@ jobs:
           - "2.4"
           - "2.3"  # lowest supported
         dependencies: [ "highest" ]
+        exclude:
+          - # incompatible combination
+            php: "8.4"
+            composer: "2.3"
         include:
           - # lowest supported
             php: "8.1"
-            composer: "2.3"
+            composer: "2.3.0"
             dependencies: "lowest"
     steps:
       - name: Checkout
@@ -184,7 +189,7 @@ jobs:
         # see https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.PHP_VERSION_LATEST }}
+          php-version: ${{ matrix.php }}
           extensions: ${{ env.PHP_PROJECT_EXT }}
           tools: composer:${{ matrix.composer }}
           coverage: none
@@ -197,10 +202,11 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ github.job }}-${{ runner.os }}-php${{ matrix.php }}-${{ matrix.dependencies }}-${{ hashFiles('composer.*', 'tools/psalm/composer.*') }}
+          key: composer-${{ github.job }}-${{ runner.os }}-php${{ matrix.php }}-c${{ matrix.composer }}-${{ matrix.dependencies }}-${{ hashFiles('composer.*', 'tools/psalm/composer.*') }}
           restore-keys: |
-            composer-${{ github.job }}-${{ runner.os }}-php${{ matrix.php }}-${{ matrix.dependencies }}-
-            composer-${{ github.job }}-${{ runner.os }}-php${{ matrix.php }}-
+            composer-${{ github.job }}-${{ runner.os }}-p${{ matrix.php }}-c${{ matrix.composer }}-${{ matrix.dependencies }}-
+            composer-${{ github.job }}-${{ runner.os }}-p${{ matrix.php }}-c${{ matrix.composer }}-
+            composer-${{ github.job }}-${{ runner.os }}-p${{ matrix.php }}-
             composer-${{ github.job }}-${{ runner.os }}-
       - name: Install psalm
         run: composer install --no-interaction --no-progress --prefer-dist
@@ -210,7 +216,6 @@ jobs:
           # removing security-foo here is fine, as no code is run, only parsed
           composer remove --dev 'roave/security-advisories' \
              --no-update --no-install
-          composer config platform.php ${{ matrix.php }}
           composer update \
             --no-interaction --no-progress \
             --prefer-dist \
@@ -321,7 +326,7 @@ jobs:
         # see https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.PHP_VERSION_LATEST }}
+          php-version: ${{ env.PHP_VERSION_LOWEST }}
           extensions: ${{ env.PHP_PROJECT_EXT }}
           tools: 'composer:v2'
           coverage: none
@@ -343,8 +348,7 @@ jobs:
       - name: Run PHP-CS-Fixer tests
         run: >
           php tools/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer
-          fix
-          --dry-run
+          check
           --diff
           --using-cache=no
           --show-progress=dots
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -33,11 +33,18 @@
      * assistance via tool: https://mlocati.github.io/php-cs-fixer-configurator/
      */
         [
+            // region migrate
+            // lowest supported PHP
+            '@PHP80Migration:risky' => true, // there is no `PHP81Migration:risky`
             '@PHP81Migration' => true,
-            '@PHP80Migration:risky' => true,
+            // lowest supported Phpunit
             '@PHPUnit100Migration:risky' => true,
+            // endregion migrate
+            // region general code style
             '@Symfony' => true,
             '@Symfony:risky' => true,
+            // endregion general code style
+            // region customs
             'declare_strict_types' => true,
             'header_comment' => ['header' => $header],
             'global_namespace_import' => true,
@@ -48,6 +55,7 @@
                     'psalm-suppress', // needed when PSALM introduced some issues that only manual hints can solve
                 ],
             ],
+            // endregion customs
         ]
     )
     ->setRiskyAllowed(true)
diff --git a/HISTORY.md b/HISTORY.md
@@ -6,10 +6,14 @@ All notable changes to this project will be documented in this file.
 
 <!-- add unreleased items here -->
 
+* Added
+  * Officially support PHP 8.4 ([#500] via [#522])
 * Misc
   * Added`Override` markers where needed (via [#531])  
     See also: <https://wiki.php.net/rfc/marking_overriden_methods>
 
+[#500]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/500
+[#522]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/522
 [#531]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/531
 
 ## 5.2.1 - 2025-01-27
diff --git a/composer.json b/composer.json
@@ -105,7 +105,7 @@
             "@php tools/composer-require-checker/vendor/maglnet/composer-require-checker/bin/composer-require-checker check"
         ],
         "test:composer-unused": "@php tools/composer-unused/vendor/icanhazstring/composer-unused/bin/composer-unused --excludeDir=tools",
-        "test:cs-fixer": "@php tools/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff",
+        "test:cs-fixer": "@php tools/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer check --diff",
         "test:phpunit": "@php -d zend.assertions=1 -d assert.exception=1 -d display_errors=On -d error_reporting=-1 -d log_errors_max_len=0 -d memory_limit=-1 tools/phpunit/vendor/phpunit/phpunit/phpunit",
         "test:psalm": "@php tools/psalm/vendor/vimeo/psalm/psalm"
     },
