summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-21 11:00:14 +0200
committerRemi Collet <remi@remirepo.net>2019-10-21 11:00:14 +0200
commitaea6bfa4d2c8e698bf39f7460652282e283cc9cc (patch)
tree6f202a5fb04901d3679c6cc924092abaec6b6b78 /composer.json
parent6dc80cb962558a08c1a050fff7117886e62f1103 (diff)
- update to 1.2.0 (no change)HEADmaster
- raise dependency on zend-stdlib 3.2.1
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json9
1 files changed, 3 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 09aa0fa..74f617b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,15 +19,12 @@
"php": "^5.6 || ^7.0",
"zendframework/zend-mvc": "^3.0",
"zendframework/zend-session": "^2.8.5",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "zendframework/zend-stdlib": "^3.2.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
"zendframework/zend-coding-standard": "~1.0.0"
},
- "conflict": {
- "zendframework/zend-mvc": "<3.0.0"
- },
"autoload": {
"psr-4": {
"Zend\\Mvc\\Plugin\\Prg\\": "src/"
@@ -43,8 +40,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev",
- "dev-develop": "1.2.x-dev"
+ "dev-master": "1.2.x-dev",
+ "dev-develop": "1.3.x-dev"
},
"zf": {
"component": "Zend\\Mvc\\Plugin\\Prg"