Skip to content

Commit 62ba7af

Browse files
authored
Merge pull request #203 from gsteel/php8.5
Drop support for PHP 8.1, add support for PHP 8.5
2 parents 9d389c4 + aca4465 commit 62ba7af

17 files changed

+814
-587
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
- 'refs/pull/*'
99
tags:
1010

11+
env:
12+
default_php: 8.2
13+
1114
jobs:
1215
matrix:
1316
name: Generate job matrix
@@ -30,4 +33,22 @@ jobs:
3033
- name: ${{ matrix.name }}
3134
uses: laminas/laminas-continuous-integration-action@v1
3235
with:
33-
job: ${{ matrix.job }}
36+
job: ${{ matrix.job }}
37+
38+
#
39+
# Runs CS in a separate job because composer plugins need to run here, but must be disabled
40+
# everywhere else in the matrix.
41+
#
42+
coding-standards:
43+
name: Coding Standards
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: actions/[email protected]
47+
- uses: shivammathur/[email protected]
48+
with:
49+
php-version: ${{ env.default_php }}
50+
tools: composer
51+
- uses: ramsey/composer-install@v3
52+
with:
53+
composer-options: "--no-scripts"
54+
- run: vendor/bin/phpcs

.laminas-ci.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44
"--no-plugins"
55
],
66
"ignore_php_platform_requirements": {
7-
}
8-
}
7+
"8.5": true
8+
},
9+
"exclude": [
10+
{
11+
"name": "PHPCodeSniffer"
12+
}
13+
]
14+
}

composer.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"laminas/laminas-component-installer": true
3131
},
3232
"platform": {
33-
"php": "8.1.99"
33+
"php": "8.2.99"
3434
}
3535
},
3636
"extra": {
@@ -44,35 +44,35 @@
4444
}
4545
},
4646
"require": {
47-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4",
47+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
4848
"composer/package-versions-deprecated": "^1.11.99.5",
4949
"laminas/laminas-component-installer": "^2.6 || ^3.5",
5050
"laminas/laminas-config-aggregator": "^1.18",
51-
"laminas/laminas-diactoros": "^3.5.0",
52-
"laminas/laminas-stdlib": "^3.20",
53-
"mezzio/mezzio": "^3.20.1",
54-
"mezzio/mezzio-helpers": "^5.17"
51+
"laminas/laminas-diactoros": "^3.8.0",
52+
"laminas/laminas-stdlib": "^3.21",
53+
"mezzio/mezzio": "^3.23.1",
54+
"mezzio/mezzio-helpers": "^5.20"
5555
},
5656
"require-dev": {
5757
"chubbyphp/chubbyphp-laminas-config": "^1.3.0",
58-
"composer/composer": "^2.8.6",
59-
"elie29/zend-phpdi-config": "^9.0.1",
60-
"filp/whoops": "^2.17.0",
58+
"composer/composer": "^2.8.12",
59+
"elie29/zend-phpdi-config": "^9.0.2",
60+
"filp/whoops": "^2.18.4",
6161
"jsoumelidis/zend-sf-di-config": "^0.5.1",
62-
"laminas/laminas-coding-standard": "~2.5.0",
63-
"laminas/laminas-development-mode": "^3.13.0",
64-
"laminas/laminas-servicemanager": "^3.23.0",
65-
"mezzio/mezzio-fastroute": "^3.12.0",
66-
"mezzio/mezzio-laminasrouter": "^3.10.0",
67-
"mezzio/mezzio-laminasviewrenderer": "^2.16.0",
68-
"mezzio/mezzio-platesrenderer": "^2.11.0",
69-
"mezzio/mezzio-tooling": "^2.10.1",
70-
"mezzio/mezzio-twigrenderer": "^2.17.0",
62+
"laminas/laminas-coding-standard": "^3.1.0",
63+
"laminas/laminas-development-mode": "^3.14.0",
64+
"laminas/laminas-servicemanager": "^3.23.1",
65+
"mezzio/mezzio-fastroute": "^3.14.0",
66+
"mezzio/mezzio-laminasrouter": "^3.12.0",
67+
"mezzio/mezzio-laminasviewrenderer": "^2.19.0",
68+
"mezzio/mezzio-platesrenderer": "^2.13.0",
69+
"mezzio/mezzio-tooling": "^2.12.0",
70+
"mezzio/mezzio-twigrenderer": "^2.18.0",
7171
"mikey179/vfsstream": "^1.6.12",
72-
"phpunit/phpunit": "^10.5.45",
73-
"psalm/plugin-phpunit": "^0.19.2",
72+
"phpunit/phpunit": "^11.5.42",
73+
"psalm/plugin-phpunit": "^0.19.5",
7474
"roave/security-advisories": "dev-master",
75-
"vimeo/psalm": "^6.8.8"
75+
"vimeo/psalm": "^6.13.1"
7676
},
7777
"conflict": {
7878
"amphp/dns": "<2.4.0",

0 commit comments

Comments
 (0)