Skip to content

Commit 111bb80

Browse files
authored
Adds support for PHP 8.4 (#500)
1 parent acfba91 commit 111bb80

19 files changed

+885
-1083
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,13 @@ updates:
55
schedule:
66
interval: "daily"
77
- package-ecosystem: "composer"
8-
directory: "/tools/cs-fixer"
9-
schedule:
10-
interval: "monthly"
11-
- package-ecosystem: "composer"
12-
directory: "/tools/infection"
13-
schedule:
14-
interval: "monthly"
15-
- package-ecosystem: "composer"
16-
directory: "/tools/phpbench"
17-
schedule:
18-
interval: "monthly"
19-
- package-ecosystem: "composer"
20-
directory: "/tools/phpstan"
21-
schedule:
22-
interval: "monthly"
23-
- package-ecosystem: "composer"
24-
directory: "/tools/psalm"
8+
directories:
9+
- "/tools/cs-fixer"
10+
- "/tools/infection"
11+
- "/tools/phpbench"
12+
- "/tools/phpstan"
13+
- "/tools/psalm"
14+
- package-ecosystem: "github-actions"
15+
directory: "/"
2516
schedule:
2617
interval: "monthly"

.github/workflows/dependabot-auto-merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v1
15+
uses: dependabot/fetch-metadata@v2
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Enable auto-merge for Dependabot PRs

.github/workflows/test-suite.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ jobs:
2222
- "8.1"
2323
- "8.2"
2424
- "8.3"
25+
- "8.4"
2526
operating-system:
2627
- "ubuntu-latest"
2728

2829
steps:
2930
- name: "Checkout"
30-
uses: "actions/checkout@v2"
31+
uses: "actions/checkout@v4"
3132

3233
- name: "Install PHP"
3334
uses: "shivammathur/setup-php@v2"
@@ -40,10 +41,10 @@ jobs:
4041
- name: "Get Composer Cache Directory"
4142
id: composer-cache
4243
run: |
43-
echo "::set-output name=dir::$(composer config cache-files-dir)"
44+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4445
4546
- name: "Cache Composer dependencies"
46-
uses: "actions/cache@v2"
47+
uses: "actions/cache@v4"
4748
with:
4849
path: |
4950
${{ steps.composer-cache.outputs.dir }}
@@ -71,7 +72,7 @@ jobs:
7172
runs-on: "ubuntu-latest"
7273
steps:
7374
- name: "Checkout"
74-
uses: "actions/checkout@v2"
75+
uses: "actions/checkout@v4"
7576

7677
- name: "Install PHP"
7778
uses: "shivammathur/setup-php@v2"
@@ -84,10 +85,10 @@ jobs:
8485
- name: "Get Composer Cache Directory"
8586
id: composer-cache
8687
run: |
87-
echo "::set-output name=dir::$(composer config cache-files-dir)"
88+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
8889
8990
- name: "Cache Composer dependencies"
90-
uses: "actions/cache@v2"
91+
uses: "actions/cache@v4"
9192
with:
9293
path: |
9394
${{ steps.composer-cache.outputs.dir }}
@@ -106,7 +107,7 @@ jobs:
106107
runs-on: "ubuntu-latest"
107108
steps:
108109
- name: "Checkout"
109-
uses: "actions/checkout@v2"
110+
uses: "actions/checkout@v4"
110111

111112
- name: "Install PHP"
112113
uses: "shivammathur/setup-php@v2"
@@ -119,10 +120,10 @@ jobs:
119120
- name: "Get Composer Cache Directory"
120121
id: composer-cache
121122
run: |
122-
echo "::set-output name=dir::$(composer config cache-files-dir)"
123+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
123124
124125
- name: "Cache Composer dependencies"
125-
uses: "actions/cache@v2"
126+
uses: "actions/cache@v4"
126127
with:
127128
path: |
128129
${{ steps.composer-cache.outputs.dir }}

composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "~8.1 || ~8.2 || ~8.3",
18+
"php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
1919
"ext-filter": "*",
2020
"ext-json": "*",
2121
"ext-simplexml": "*",
@@ -47,7 +47,10 @@
4747
}
4848
},
4949
"config": {
50-
"sort-packages": true
50+
"sort-packages": true,
51+
"platform": {
52+
"php": "8.1"
53+
}
5154
},
5255
"scripts": {
5356
"benchmark": [
@@ -79,14 +82,14 @@
7982
"composer install --working-dir=./tools/infection",
8083
"composer install --working-dir=./tools/phpbench",
8184
"composer install --working-dir=./tools/phpstan",
82-
"composer install --working-dir=./tools/psalm"
85+
"composer install --working-dir=./tools/psalm --ignore-platform-req=php"
8386
],
8487
"tools:update": [
8588
"composer update --working-dir=./tools/cs-fixer",
8689
"composer update --working-dir=./tools/infection",
8790
"composer update --working-dir=./tools/phpbench",
8891
"composer update --working-dir=./tools/phpstan",
89-
"composer update --working-dir=./tools/psalm"
92+
"composer update --working-dir=./tools/psalm --ignore-platform-req=php"
9093
],
9194
"post-install-cmd": [
9295
"@tools:install"

0 commit comments

Comments
 (0)