Merge develop into master

.github/workflows/php.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v3
@@ -33,6 +33,9 @@ jobs:
         run: composer install --ansi --prefer-dist --no-interaction --no-progress
 
       - name: Run PHPCSFixer
+        env:
+          ## Useful until PHPCSFixer supports PHP 8.4
+          PHP_CS_FIXER_IGNORE_ENV: 1
         run: ./vendor/bin/php-cs-fixer fix --dry-run --diff
 
       - name: Run ergebnis/composer-normalize
@@ -48,7 +51,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -73,7 +76,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           coverage: 'xdebug'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-apache as builder
+FROM php:8.4-apache as builder
 
 RUN apt-get update && \
     apt-get install -y \
@@ -15,7 +15,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN composer install
 
 
-FROM php:8.3-apache
+FROM php:8.4-apache
 
 RUN apt-get update && \
     apt-get install -y \ 

composer.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "beberlei/doctrineextensions": "^1.3",
@@ -21,8 +21,8 @@
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.41",
-        "friendsofphp/php-cs-fixer": "^3.45",
-        "phpstan/phpstan": "^1.10",
+        "friendsofphp/php-cs-fixer": "^3.65",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^11.0",
         "symfony/browser-kit": "~7.1.0",
         "symfony/css-selector": "~7.1.0",