Skip to content

Commit eab9026

Browse files
Merge pull request #24 from internalsystemerror/feature/php8
WIP: Add support for PHP 8
2 parents 10867e3 + 81c8d58 commit eab9026

28 files changed

+868
-363
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.phpcs-cache
2+
/.phpunit.result.cache
23
/clover.xml
34
/coveralls-upload.json
45
/phpunit.xml

composer.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,38 @@
2929
}
3030
},
3131
"require": {
32-
"php": "^7.3",
32+
"php": "^7.3 || ~8.0.0",
3333
"laminas-api-tools/api-tools": "^1.3",
3434
"laminas-api-tools/api-tools-rest": "^1.3.2",
3535
"laminas/laminas-hydrator": "^2.4.2 || ^3.0",
36+
"laminas/laminas-stdlib": "^3.3",
3637
"laminas/laminas-view": "^2.11.3",
3738
"laminas/laminas-zendframework-bridge": "^1.0",
3839
"phpro/zf-doctrine-hydration-module": "^2.0.1 || ^3.0 || ^4.1"
3940
},
4041
"require-dev": {
41-
"doctrine/doctrine-module": "^1.2 || ^2.1.7",
42-
"doctrine/doctrine-mongo-odm-module": "^0.11 || ^1.0 || ^2.0",
42+
"doctrine/doctrine-module": "^1.2.0 || ^2.1.7",
43+
"doctrine/doctrine-mongo-odm-module": "^0.11.0 || ^1.0.0 || ^2.0.0",
4344
"doctrine/doctrine-orm-module": "^1.1.8 || ^2.1.3",
44-
"doctrine/mongodb-odm": "^1.0",
45-
"doctrine/orm": "^2.6.3",
45+
"doctrine/mongodb-odm": "^1.1.0",
4646
"laminas-api-tools/api-tools-admin": "^1.5.7",
4747
"laminas-api-tools/api-tools-hal": "^1.6.1",
4848
"laminas/laminas-coding-standard": "~2.3.0",
4949
"laminas/laminas-form": "^2.9.2",
5050
"laminas/laminas-i18n": "^2.7.3",
5151
"laminas/laminas-log": "^2.9.1",
5252
"laminas/laminas-mvc": "^2.7.13 || ^3.0.2",
53-
"laminas/laminas-serializer": "^2.8",
54-
"laminas/laminas-stdlib": "^2.7.8 || ^3.2.1",
53+
"laminas/laminas-serializer": "^2.8.0",
5554
"laminas/laminas-test": "^2.6.1 || ^3.0.1",
5655
"mongodb/mongodb": "^1.1.0",
57-
"phpunit/phpunit": "^7.5.15",
56+
"phpspec/prophecy-phpunit": "^2.0",
57+
"phpunit/phpunit": "^9.3",
5858
"symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0"
5959
},
60+
"conflict": {
61+
"doctrine/dbal": "<2.12.0",
62+
"doctrine/orm": "<2.6.3"
63+
},
6064
"suggest": {
6165
"api-skeletons/zf-doctrine-hydrator": "Hydrator strategies for Doctrine in Laminas API Tools",
6266
"api-skeletons/zf-oauth2-doctrine": "OAuth2 Doctrine Adapter for Laminas API Tools",

0 commit comments

Comments
 (0)