Skip to content

Commit 6616c1b

Browse files
authored
Allow PHP 8.2, drop PHP 8.0 (#43)
1 parent f3fa53f commit 6616c1b

File tree

4 files changed

+34
-37
lines changed

4 files changed

+34
-37
lines changed

.github/workflows/integrate.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
php-version:
18-
- "8.0"
18+
- "8.1"
1919

2020
steps:
2121
- name: "Checkout"
@@ -42,8 +42,8 @@ jobs:
4242
strategy:
4343
matrix:
4444
php-version:
45-
- "8.0"
4645
- "8.1"
46+
- "8.2"
4747
dependencies:
4848
- "highest"
4949

@@ -69,6 +69,9 @@ jobs:
6969
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
7070
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
7171

72+
- name: "Remove PHP-CS-Fixer not ready for PHP 8.2 yet"
73+
run: "composer remove --dev --no-update slam/php-cs-fixer-extensions"
74+
7275
- name: "Install lowest dependencies"
7376
if: ${{ matrix.dependencies == 'lowest' }}
7477
run: "composer update --no-interaction --no-progress --prefer-lowest"
@@ -89,7 +92,7 @@ jobs:
8992
strategy:
9093
matrix:
9194
php-version:
92-
- "8.0"
95+
- "8.1"
9396

9497
steps:
9598
- name: "Checkout"
@@ -117,7 +120,7 @@ jobs:
117120
run: "composer update --no-interaction --no-progress"
118121

119122
- name: "Run tests"
120-
timeout-minutes: 3
123+
timeout-minutes: 10
121124
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
122125

123126
- name: "Send code coverage report to Codecov.io"
@@ -135,7 +138,7 @@ jobs:
135138
strategy:
136139
matrix:
137140
php-version:
138-
- "8.0"
141+
- "8.1"
139142

140143
steps:
141144
- name: "Checkout"
@@ -172,7 +175,7 @@ jobs:
172175
strategy:
173176
matrix:
174177
php-version:
175-
- "8.0"
178+
- "8.1"
176179

177180
steps:
178181
- name: "Checkout"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ all: csfix static-analysis test
22
@echo "Done."
33

44
vendor: composer.json
5-
composer update
5+
composer update --ignore-platform-req=php
66
touch vendor
77

88
.PHONY: csfix
99
csfix: vendor
10-
vendor/bin/php-cs-fixer fix --verbose
10+
php8.1 vendor/bin/php-cs-fixer fix --verbose
1111

1212
.PHONY: static-analysis
1313
static-analysis: vendor

composer.json

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,40 @@
1818
}
1919
],
2020
"require": {
21-
"php": "~8.0.0 || ~8.1.0",
21+
"php": "~8.1.0 || ~8.2.0",
2222
"phpstan/phpstan": "^1.9.2"
2323
},
2424
"require-dev": {
25-
"laminas/laminas-cache": "^3.8.0",
25+
"laminas/laminas-cache": "^3.9.0",
2626
"laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
27-
"laminas/laminas-filter": "^2.28.1",
28-
"laminas/laminas-form": "^3.7.0",
29-
"laminas/laminas-hydrator": "^4.8.0",
30-
"laminas/laminas-i18n": "^2.19.0",
27+
"laminas/laminas-filter": "^2.29.0",
28+
"laminas/laminas-form": "^3.8.0",
29+
"laminas/laminas-hydrator": "^4.10.0",
30+
"laminas/laminas-i18n": "^2.21.0",
3131
"laminas/laminas-inputfilter": "^2.22.1",
3232
"laminas/laminas-log": "^2.16.0",
33-
"laminas/laminas-mail": "^2.20.0",
34-
"laminas/laminas-mvc": "^3.5.0",
35-
"laminas/laminas-paginator": "^2.15.1",
33+
"laminas/laminas-mail": "^2.21.0",
34+
"laminas/laminas-mvc": "^3.6.0",
35+
"laminas/laminas-paginator": "^2.17.0",
3636
"laminas/laminas-validator": "^2.28.0",
37-
"malukenho/mcbumpface": "^1.1.5",
3837
"phpstan/phpstan-deprecation-rules": "^1.0.0",
39-
"phpstan/phpstan-phpunit": "^1.2.2",
40-
"phpunit/phpunit": "^9.5.26",
38+
"phpstan/phpstan-phpunit": "^1.3.0",
39+
"phpunit/phpunit": "^9.5.27",
4140
"slam/php-cs-fixer-extensions": "^v3.2.1",
4241
"slam/php-debug-r": "^v1.7.0"
4342
},
4443
"conflict": {
45-
"laminas/laminas-cache": "<3.1",
46-
"laminas/laminas-filter": "<2.14",
47-
"laminas/laminas-form": "<3.1",
48-
"laminas/laminas-hydrator": "<4.3",
49-
"laminas/laminas-i18n": "<2.15",
50-
"laminas/laminas-inputfilter": "<2.13",
51-
"laminas/laminas-log": "<2.15",
52-
"laminas/laminas-mail": "<2.16",
53-
"laminas/laminas-mvc": "<3.3",
54-
"laminas/laminas-paginator": "<2.12",
55-
"laminas/laminas-validator": "<2.17"
44+
"laminas/laminas-cache": "<3.9",
45+
"laminas/laminas-filter": "<2.29",
46+
"laminas/laminas-form": "<3.8",
47+
"laminas/laminas-hydrator": "<4.10",
48+
"laminas/laminas-i18n": "<2.21",
49+
"laminas/laminas-inputfilter": "<2.22",
50+
"laminas/laminas-log": "<2.16",
51+
"laminas/laminas-mail": "<2.21",
52+
"laminas/laminas-mvc": "<3.6",
53+
"laminas/laminas-paginator": "<2.17",
54+
"laminas/laminas-validator": "<2.28"
5655
},
5756
"autoload": {
5857
"psr-4": {
@@ -64,11 +63,6 @@
6463
"tests/"
6564
]
6665
},
67-
"config": {
68-
"allow-plugins": {
69-
"malukenho/mcbumpface": true
70-
}
71-
},
7266
"extra": {
7367
"phpstan": {
7468
"includes": [

tests/LaminasIntegration/data/stdlibArrayObjectCrate-2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"message": "Call to an undefined method Laminas\\Stdlib\\ArrayObject::foo().",
3+
"message": "Call to an undefined method Laminas\\Stdlib\\ArrayObject<*NEVER*, *NEVER*>::foo().",
44
"line": 15,
55
"ignorable": true
66
}

0 commit comments

Comments
 (0)