Skip to content

Commit b15b4c9

Browse files
authored
Add PHP 8.5 support, drop PHP < 8.4 (#89)
* Add PHP 8.5 support, drop PHP < 8.4 * Some laminas packages are a bit behind schedule, let's use `--ignore-platform-req=php` for now
1 parent 42aeb9c commit b15b4c9

4 files changed

Lines changed: 25 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
php-version:
20-
- "8.3"
20+
- "8.4"
2121

2222
steps:
2323
- uses: "actions/checkout@v6"
@@ -37,8 +37,8 @@ jobs:
3737
strategy:
3838
matrix:
3939
php-version:
40-
- "8.3"
4140
- "8.4"
41+
- "8.5"
4242

4343
steps:
4444
- uses: "actions/checkout@v6"
@@ -48,6 +48,8 @@ jobs:
4848
php-version: "${{ matrix.php-version }}"
4949
ini-values: "${{ env.INI_VALUES }}"
5050
- uses: "ramsey/composer-install@v3"
51+
with:
52+
composer-options: "--ignore-platform-req=php"
5153

5254
- name: "Run tests"
5355
timeout-minutes: 5
@@ -59,7 +61,7 @@ jobs:
5961
strategy:
6062
matrix:
6163
php-version:
62-
- "8.3"
64+
- "8.4"
6365

6466
steps:
6567
- uses: "actions/checkout@v6"
@@ -69,6 +71,8 @@ jobs:
6971
php-version: "${{ matrix.php-version }}"
7072
ini-values: "${{ env.INI_VALUES }}"
7173
- uses: "ramsey/composer-install@v3"
74+
with:
75+
composer-options: "--ignore-platform-req=php"
7276

7377
- name: "Run tests"
7478
timeout-minutes: 10
@@ -87,7 +91,7 @@ jobs:
8791
strategy:
8892
matrix:
8993
php-version:
90-
- "8.3"
94+
- "8.4"
9195

9296
steps:
9397
- uses: "actions/checkout@v6"
@@ -97,6 +101,8 @@ jobs:
97101
php-version: "${{ matrix.php-version }}"
98102
ini-values: "${{ env.INI_VALUES }}"
99103
- uses: "ramsey/composer-install@v3"
104+
with:
105+
composer-options: "--ignore-platform-req=php"
100106

101107
- name: "Check coding standards"
102108
run: "vendor/bin/php-cs-fixer fix --verbose --dry-run --diff"
@@ -107,7 +113,7 @@ jobs:
107113
strategy:
108114
matrix:
109115
php-version:
110-
- "8.3"
116+
- "8.4"
111117

112118
steps:
113119
- uses: "actions/checkout@v6"
@@ -117,6 +123,8 @@ jobs:
117123
php-version: "${{ matrix.php-version }}"
118124
ini-values: "${{ env.INI_VALUES }}"
119125
- uses: "ramsey/composer-install@v3"
126+
with:
127+
composer-options: "--ignore-platform-req=php"
120128

121129
- name: "Run static analysis"
122130
run: "vendor/bin/phpstan analyse --no-progress"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3
1+
FROM php:8.5
22

33
ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
44

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ all: csfix static-analysis test
99

1010
vendor: .env docker-compose.yml Dockerfile composer.json
1111
docker compose build --pull
12-
$(DOCKER_PHP_EXEC) composer update
12+
$(DOCKER_PHP_EXEC) composer update --ignore-platform-req=php
1313
$(DOCKER_PHP_EXEC) composer bump
1414
touch --no-create $@
1515

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
}
1919
],
2020
"require": {
21-
"php": "~8.3.0 || ~8.4.0",
22-
"phpstan/phpstan": "^2.1.31"
21+
"php": "~8.4.0 || ~8.5.0",
22+
"phpstan/phpstan": "^2.1.33"
2323
},
2424
"require-dev": {
2525
"laminas/laminas-filter": "^2.42.0",
26-
"laminas/laminas-form": "^3.22.0",
27-
"laminas/laminas-hydrator": "^4.16.0",
28-
"laminas/laminas-i18n": "^2.31.0",
29-
"laminas/laminas-inputfilter": "^2.34.0",
26+
"laminas/laminas-form": "^3.24.2",
27+
"laminas/laminas-hydrator": "^4.17.0",
28+
"laminas/laminas-i18n": "^2.32.1",
29+
"laminas/laminas-inputfilter": "^2.35.0",
3030
"laminas/laminas-mvc": "^3.8.0",
31-
"laminas/laminas-paginator": "^2.21.0",
31+
"laminas/laminas-paginator": "^2.22.0",
3232
"laminas/laminas-validator": "^2.65.0",
3333
"phpstan/phpstan-deprecation-rules": "^2.0.3",
34-
"phpstan/phpstan-phpunit": "^2.0.7",
35-
"phpunit/phpunit": "^11.5.42",
36-
"slam/php-cs-fixer-extensions": "^3.13.0"
34+
"phpstan/phpstan-phpunit": "^2.0.11",
35+
"phpunit/phpunit": "^11.5.46",
36+
"slam/php-cs-fixer-extensions": "^3.14.0"
3737
},
3838
"conflict": {
3939
"laminas/laminas-filter": "<2.41",

0 commit comments

Comments
 (0)