Adds support for PHP 8.4 (#500)

coduo · Dec 20, 2024 · 111bb80 · 111bb80
1 parent acfba91
commit 111bb80
Show file tree

Hide file tree

Showing 19 changed files with 885 additions and 1,083 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,22 +5,13 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "composer"
-    directory: "/tools/cs-fixer"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "composer"
-    directory: "/tools/infection"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "composer"
-    directory: "/tools/phpbench"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "composer"
-    directory: "/tools/phpstan"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "composer"
-    directory: "/tools/psalm"
+    directories:
+      - "/tools/cs-fixer"
+      - "/tools/infection"
+      - "/tools/phpbench"
+      - "/tools/phpstan"
+      - "/tools/psalm"
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       interval: "monthly"
diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -22,12 +22,13 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -40,10 +41,10 @@ jobs:
       - name: "Get Composer Cache Directory"
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: "Cache Composer dependencies"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v4"
         with:
           path: |
             ${{ steps.composer-cache.outputs.dir }}
@@ -71,7 +72,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -84,10 +85,10 @@ jobs:
       - name: "Get Composer Cache Directory"
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: "Cache Composer dependencies"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v4"
         with:
           path: |
             ${{ steps.composer-cache.outputs.dir }}
@@ -106,7 +107,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -119,10 +120,10 @@ jobs:
       - name: "Get Composer Cache Directory"
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: "Cache Composer dependencies"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v4"
         with:
           path: |
             ${{ steps.composer-cache.outputs.dir }}

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "~8.1 || ~8.2 || ~8.3",
+        "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
         "ext-filter": "*",
         "ext-json": "*",
         "ext-simplexml": "*",
@@ -47,7 +47,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "8.1"
+        }
     },
     "scripts": {
         "benchmark": [
@@ -79,14 +82,14 @@
             "composer install --working-dir=./tools/infection",
             "composer install --working-dir=./tools/phpbench",
             "composer install --working-dir=./tools/phpstan",
-            "composer install --working-dir=./tools/psalm"
+            "composer install --working-dir=./tools/psalm --ignore-platform-req=php"
         ],
         "tools:update": [
             "composer update --working-dir=./tools/cs-fixer",
             "composer update --working-dir=./tools/infection",
             "composer update --working-dir=./tools/phpbench",
             "composer update --working-dir=./tools/phpstan",
-            "composer update --working-dir=./tools/psalm"
+            "composer update --working-dir=./tools/psalm --ignore-platform-req=php"
         ],
         "post-install-cmd": [
             "@tools:install"