Skip to content

Commit 3662741

Browse files
authored
Merge pull request #56 from driehle/feat/php84
Allow PHP 8.4
2 parents 8cd8ca9 + 4d3379a commit 3662741

File tree

8 files changed

+1863
-1873
lines changed

8 files changed

+1863
-1873
lines changed

.laminas-ci.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"extensions": [
33
"ldap"
4-
]
4+
],
5+
"ignore_php_platform_requirements": {
6+
"8.4": true
7+
}
58
}

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"extra": {
2828
},
2929
"require": {
30-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
30+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
3131
"ext-ldap": "*"
3232
},
3333
"require-dev": {
3434
"laminas/laminas-coding-standard": "~2.5.0",
3535
"laminas/laminas-config": "^3.8.0",
3636
"laminas/laminas-eventmanager": "^3.6.0",
3737
"laminas/laminas-stdlib": "^3.15.0",
38-
"php-mock/php-mock-phpunit": "^2.6.1",
39-
"phpunit/phpunit": "^9.5.26",
38+
"php-mock/php-mock-phpunit": "^2.8.0",
39+
"phpunit/phpunit": "^10.5.41",
4040
"psalm/plugin-phpunit": "^0.18.4",
4141
"vimeo/psalm": "^5.16"
4242
},
@@ -65,6 +65,7 @@
6565
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
6666
},
6767
"conflict": {
68+
"amphp/amp":"<2.6.4",
6869
"zendframework/zend-ldap": "*"
6970
}
7071
}

0 commit comments

Comments
 (0)