summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-07 11:10:46 +0200
committerRemi Collet <remi@remirepo.net>2019-10-07 11:10:46 +0200
commit83664688e4af5c7f935b061f943e35b972b4cd11 (patch)
treebeff172e5b908f997d4720ed5c4f4f39f3fb0db8 /composer.json
parent00d6bdfe5ef93254ad5280d36a6191036414d35e (diff)
- update to 3.4.0
- drop patch merged upstream - use phpunit8
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index bfd067b..cb500dd 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
"require-dev": {
"ext-phar": "*",
"doctrine/annotations": "^1.0",
- "phpunit/phpunit": "^7.5.15",
+ "phpunit/phpunit": "^7.5.16 || ^8.4",
"zendframework/zend-coding-standard": "^1.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
@@ -45,8 +45,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev",
- "dev-develop": "3.4.x-dev"
+ "dev-master": "3.4.x-dev",
+ "dev-develop": "3.5.x-dev"
}
},
"scripts": {