PHP 8.4 support

.github/workflows/php.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.3' ]
+        php-version: [ '8.3', '8.4' ]
         symfony-version: ['6.4.*', '7.0.*' ]
         symfony-deprecations-helper: [ 'max[direct]=0&baselineFile=./tests/allowed.json' ]
         grumphp-testsuite: [ 'no-analyse' ]
@@ -34,6 +34,11 @@ jobs:
             symfony-version: '6.4.*'
             symfony-deprecations-helper: 'max[direct]=0&max[indirect]=99999&baselineFile=./tests/allowed.json'
             grumphp-testsuite: 'main'
+          - php-version: '8.2'
+            symfony-version: '7.0.*'
+            symfony-deprecations-helper: 'max[indirect]=99999&baselineFile=./tests/allowed.json'
+            grumphp-flag: '-no-analyse'
+            grumphp-testsuite: 'no-analyse'
 
     name: "PHP: ${{ matrix.php-version }}, Symfony: ${{ matrix.symfony-version }}, GrumPHP: ${{ matrix.grumphp-testsuite }}, Composer: ${{ matrix.composer-flag }}"
 

composer.json

@@ -67,6 +67,7 @@
     "grumphp8.2": "grumphp run --testsuite=php8.2",
     "grumphp8.2-no-analyse": "grumphp run --testsuite=php8.2-no-analyse",
     "grumphp8.3-no-analyse": "grumphp run --testsuite=php8.3-no-analyse",
+    "grumphp8.4-no-analyse": "grumphp run --testsuite=php8.4-no-analyse",
     "phpcs": "phpcs --standard=phpcs.xml",
     "phpcbf": "phpcbf --standard=phpcs.xml --extensions=php --tab-width=4 -sp src tests",
     "code-style:check": "php-cs-fixer --config=./.php-cs-fixer.dist.php fix --dry-run --diff --ansi --verbose src tests",

docker-compose.override.yml.osx

@@ -15,3 +15,7 @@ services:
   resetter-bundle-php83:
     volumes:
       - php_volume:/srv/www
+
+  resetter-bundle-php84:
+    volumes:
+      - php_volume:/srv/www

docker-compose.yml

@@ -2,15 +2,35 @@ services:
   # PHP
   resetter-bundle-php82:
     container_name: resetter-bundle-php82
-    build: ./docker/php82
+    build:
+      context: .
+      dockerfile: ./docker/php/Dockerfile
+      args:
+        PHP_TAG: 8.2-fpm
     volumes:
       - .:/srv/www:delegated
     environment:
       - XDEBUG_CONFIG=idekey=PHPSTORM
 
   resetter-bundle-php83:
     container_name: resetter-bundle-php83
-    build: ./docker/php83
+    build:
+      context: .
+      dockerfile: ./docker/php/Dockerfile
+      args:
+        PHP_TAG: 8.3-fpm
+    volumes:
+      - .:/srv/www:delegated
+    environment:
+      - XDEBUG_CONFIG=idekey=PHPSTORM
+
+  resetter-bundle-php84:
+    container_name: resetter-bundle-php84
+    build:
+      context: .
+      dockerfile: ./docker/php/Dockerfile
+      args:
+        PHP_TAG: 8.4-fpm
     volumes:
       - .:/srv/www:delegated
     environment:

docker/php81/Dockerfile → docker/php/Dockerfile

@@ -1,4 +1,6 @@
-FROM php:8.1-fpm
+ARG PHP_TAG="8.2-fpm"
+
+FROM php:$PHP_TAG
 
 RUN apt-get update && apt-get install -y git-core zlib1g-dev libzip-dev zip unzip
 RUN docker-php-ext-install zip pdo_mysql

grumphp.yml

@@ -25,6 +25,11 @@ grumphp:
         - phpparser
         - phplint
         - phpunit
+    php8.4-no-analyse:
+      tasks:
+        - phpparser
+        - phplint
+        - phpunit
   tasks:
     phpcs:
       standard: 'phpcs.xml'