Skip to content

Commit 5a664ed

Browse files
authored
Merge pull request #107 from weierophinney/feature/php-8.1-support
Provide PHP 8.1 support
2 parents 0c38c7b + a119c9e commit 5a664ed

22 files changed

+3370
-410
lines changed

.laminas-ci.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ignore_php_platform_requirements": {
3+
"8.1": true
4+
}
5+
}

composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
}
2626
},
2727
"require": {
28-
"php": "^7.3 || ~8.0.0",
28+
"php": "^7.3 || ~8.0.0 || ~8.1.0",
2929
"container-interop/container-interop": "^1.1",
30-
"laminas/laminas-stdlib": "^3.3",
31-
"laminas/laminas-zendframework-bridge": "^1.0"
30+
"laminas/laminas-stdlib": "^3.6"
3231
},
3332
"require-dev": {
3433
"laminas/laminas-cache": "^2.6.1",
3534
"laminas/laminas-coding-standard": "~2.2.1",
36-
"laminas/laminas-config": "^2.6",
3735
"laminas/laminas-db": "^2.7",
3836
"laminas/laminas-filter": "^2.6",
3937
"laminas/laminas-http": "^2.14.2",
@@ -43,7 +41,7 @@
4341
"laminas/laminas-session": "^2.8",
4442
"laminas/laminas-uri": "^2.7",
4543
"phpspec/prophecy-phpunit": "^2.0",
46-
"phpunit/phpunit": "^9.3",
44+
"phpunit/phpunit": "^9.5.5",
4745
"psalm/plugin-phpunit": "^0.15.0",
4846
"psr/http-client": "^1.0",
4947
"psr/http-factory": "^1.0",
@@ -67,6 +65,9 @@
6765
}
6866
},
6967
"autoload-dev": {
68+
"files": [
69+
"test/autoload.php"
70+
],
7071
"psr-4": {
7172
"LaminasTest\\Validator\\": "test/"
7273
}
@@ -82,7 +83,7 @@
8283
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
8384
"static-analysis": "psalm --shepherd --stats"
8485
},
85-
"replace": {
86-
"zendframework/zend-validator": "^2.13.0"
86+
"conflict": {
87+
"zendframework/zend-validator": "*"
8788
}
8889
}

0 commit comments

Comments
 (0)