PHP 8.4 support

cedric-anne · Feb 25, 2025 · 5c90a28 · 5c90a28
1 parent be15664
commit 5c90a28
Show file tree

Hide file tree

Showing 26 changed files with 4,520 additions and 933 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       matrix:
         include:
           - {php-version: "7.4"} # Lint on lower PHP version to detected too early usage of new syntaxes
-          - {php-version: "8.3"} # Lint on higher PHP version to detected deprecated elements usage
+          - {php-version: "8.4"} # Lint on higher PHP version to detected deprecated elements usage
     env:
       COMPOSE_FILE: ".github/actions/docker-compose-app.yml"
       APPLICATION_ROOT: "${{ github.workspace }}"
@@ -116,25 +116,26 @@ jobs:
             MATRIX='
               {
                 "include": [
+                  {"php-version": "8.4", "db-image": "mariadb:11.4"},
                   {"php-version": "8.3", "db-image": "mariadb:11.4"},
-                  {"php-version": "8.3", "db-image": "mysql:8.4"},
                   {"php-version": "8.2", "db-image": "mariadb:11.4"},
                   {"php-version": "8.1", "db-image": "mariadb:11.4"},
                   {"php-version": "8.0", "db-image": "mariadb:11.4"},
                   {"php-version": "7.4", "db-image": "mariadb:11.4"},
-                  {"php-version": "8.3", "db-image": "mariadb:10.2"},
-                  {"php-version": "8.3", "db-image": "mysql:5.7"},
-                  {"php-version": "8.3", "db-image": "percona:8.4"},
-                  {"php-version": "8.3", "db-image": "percona:5.7"}
+                  {"php-version": "8.4", "db-image": "mariadb:10.2"},
+                  {"php-version": "8.4", "db-image": "mysql:8.4"},
+                  {"php-version": "8.4", "db-image": "mysql:5.7"},
+                  {"php-version": "8.4", "db-image": "percona:8.4"},
+                  {"php-version": "8.4", "db-image": "percona:5.7"}
                 ]
               }
             '
           else
             MATRIX='
               {
                 "include": [
-                  {"php-version": "8.3", "db-image": "mariadb:11.4"},
-                  {"php-version": "8.3", "db-image": "mysql:8.4"}
+                  {"php-version": "8.4", "db-image": "mariadb:11.4"},
+                  {"php-version": "8.4", "db-image": "mysql:8.4"}
                 ]
               }
             '

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {php-version: "8.2", db-image: "mariadb:11.0"}
+          - {php-version: "8.4", db-image: "mariadb:11.4"}
     env:
       COMPOSE_FILE: ".github/actions/docker-compose-app.yml:.github/actions/docker-compose-services.yml"
       APPLICATION_ROOT: "${{ github.workspace }}"

diff --git a/composer.json b/composer.json
@@ -142,24 +142,35 @@
         "lint": "parallel-lint  --exclude files --exclude marketplace --exclude plugins --exclude vendor --exclude tools/vendor .",
         "post-install-cmd": [
             "@php -r \"file_put_contents('.composer.hash', sha1_file('composer.lock'));\"",
-            "@php -f vendor/bin/build_hw_jsons",
-            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-mail-invalid-header-ignore.patch || true",
-            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-mail-address-no-length-check.patch || true",
-            "patch -f -p1 -d vendor/atoum/atoum/ < tools/patches/atoum-4.1.0...4.2.0.patch || true",
-            "patch -f -p1 -d vendor/michelf/php-markdown/ < tools/patches/php-markdown-php8-compat.patch || true",
-            "patch -f -p1 -d vendor/guzzlehttp/guzzle/ < tools/patches/guzzle-http-client-restrict-http-methods.patch || true"
+            "@patch",
+            "@php -f vendor/bin/build_hw_jsons"
         ],
         "post-update-cmd": [
             "@php -r \"file_put_contents('.composer.hash', sha1_file('composer.lock'));\"",
-            "@php -f vendor/bin/build_hw_jsons",
-            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-mail-invalid-header-ignore.patch || true",
-            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-mail-address-no-length-check.patch || true",
-            "patch -f -p1 -d vendor/atoum/atoum/ < tools/patches/atoum-4.1.0...4.2.0.patch || true",
-            "patch -f -p1 -d vendor/michelf/php-markdown/ < tools/patches/php-markdown-php8-compat.patch || true",
-            "patch -f -p1 -d vendor/guzzlehttp/guzzle/ < tools/patches/guzzle-http-client-restrict-http-methods.patch || true"
+            "@patch",
+            "@php -f vendor/bin/build_hw_jsons"
         ],
         "build": [
             "bin/console dependencies install"
+        ],
+        "patch": [
+            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-laminas-mail-address-no-length-check.patch || true",
+            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-laminas-mail-invalid-header-ignore.patch || true",
+            "patch -f -p1 -d vendor/guzzlehttp/guzzle/ < tools/patches/guzzlehttp-guzzle-restrict-http-methods.patch || true",
+            "patch -f -p1 -d vendor/atoum/atoum/ < tools/patches/atoum-atoum-4.1.0...4.2.0.patch || true",
+            "patch -f -p1 -d vendor/atoum/atoum/ < tools/patches/atoum-atoum-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/atoum/stubs/ < tools/patches/atoum-stubs-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/firebase/php-jwt/ < tools/patches/firebase-php-jwt-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/friendsoftwig/twigcs/ < tools/patches/friendsoftwig-twigcs-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/guzzlehttp/promises/ < tools/patches/guzzlehttp-promises-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/laminas/laminas-mail/ < tools/patches/laminas-laminas-mail-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/laminas/laminas-servicemanager/ < tools/patches/laminas-laminas-servicemanager-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/league/csv/ < tools/patches/league-csv-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/michelf/php-markdown/ < tools/patches/michelf-php-markdown-php8-compat.patch || true",
+            "patch -f -p1 -d vendor/psr/http-factory/ < tools/patches/psr-http-factory-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/scssphp/scssphp/ < tools/patches/scssphp-scssphp-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/swaggest/json-diff/ < tools/patches/swaggest-json-diff-php8.4-compat.patch || true",
+            "patch -f -p1 -d vendor/wapmorgan/unified-archive/ < tools/patches/wapmorgan-unified-archive-php-8.4-compat.patch || true"
         ]
     },
     "repositories": {