Add PHP 8.4 support to CI matrix

omines · Dec 20, 2024 · f013b7c · f013b7c
1 parent dedabbd
commit f013b7c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,6 +19,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         dependencies: [ stable, beta, lowest ]
         experimental: [ false ]
         include:
@@ -29,7 +30,7 @@ jobs:
           - description: 'beta/RC dependencies'
             dependencies: beta
           # - description: 'nightly with stable dependencies'
-          #   php: 8.4
+          #   php: 8.5
           #   experimental: true
 
     name: PHP ${{ matrix.php }} ${{ matrix.description }}
@@ -61,6 +62,8 @@ jobs:
       - name: Check code style
         run: vendor/bin/php-cs-fixer fix --dry-run
         if: ${{ matrix.dependencies == 'stable' && !matrix.experimental }}
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: 1
 
       - name: Run PHPStan static analysis
         run: vendor/bin/phpstan

diff --git a/bin/prepare-commit b/bin/prepare-commit
@@ -4,6 +4,7 @@ cd $(dirname $0)/..
 
 export APP_ENV=test
 export APP_DEBUG=1
+export PHP_CS_FIXER_IGNORE_ENV=1
 export XDEBUG_MODE=coverage
 
 vendor/bin/php-cs-fixer fix

diff --git a/composer.json b/composer.json
@@ -28,22 +28,22 @@
     },
     "require-dev": {
         "ekino/phpstan-banned-code": "^2.1",
-        "friendsofphp/php-cs-fixer": "^3.59.3",
-        "infection/infection": "^0.29.6",
-        "phpstan/extension-installer": "^1.4.1",
-        "phpstan/phpstan": "^1.11.6",
-        "phpstan/phpstan-phpunit": "^1.4.0",
-        "phpstan/phpstan-symfony": "^1.4.5",
-        "phpunit/phpunit": "^10.5.15 || ^11.2.5",
-        "symfony/browser-kit": "^6.3|^7.1.1",
-        "symfony/css-selector": "^6.3|^7.1.1",
-        "symfony/debug-bundle": "^6.3|^7.1.1",
-        "symfony/dotenv": "^6.3|^7.1.1",
+        "friendsofphp/php-cs-fixer": "^3.65.0",
+        "infection/infection": "^0.29.10",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^1.12.13",
+        "phpstan/phpstan-phpunit": "^1.4.2",
+        "phpstan/phpstan-symfony": "^1.4.12",
+        "phpunit/phpunit": "^10.5.15 || ^11.5.1",
+        "symfony/browser-kit": "^6.3|^7.2.0",
+        "symfony/css-selector": "^6.3|^7.2.0",
+        "symfony/debug-bundle": "^6.3|^7.2.0",
+        "symfony/dotenv": "^6.3|^7.2.0",
         "symfony/monolog-bundle": "^3.10",
-        "symfony/routing": "^6.3|^7.1.1",
-        "symfony/runtime": "^6.3|^7.1.1",
-        "symfony/twig-bundle": "^6.3|^7.1.1",
-        "symfony/web-profiler-bundle": "^6.3|^7.1.2"
+        "symfony/routing": "^6.3|^7.2.0",
+        "symfony/runtime": "^6.3|^7.2.0",
+        "symfony/twig-bundle": "^6.3|^7.2.0",
+        "symfony/web-profiler-bundle": "^6.3|^7.2.0"
     },
     "conflict": {
         "monolog/monolog": "<3",