summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-03 09:16:09 +0100
committerRemi Collet <remi@remirepo.net>2020-01-03 09:16:09 +0100
commit8b4428d7fa469cbb00350e542de495a0ae851a73 (patch)
tree3a95ad60f2b8a23505ccccb395b9a723e386a945 /composer.json
parentf2929aa10c3a9357feef541618b70db6fdc1da3c (diff)
v2.12.0HEADmaster
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json7
1 files changed, 3 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index af0b79b..e46f5c0 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
},
"require": {
"php": "^5.6 || ^7.0",
- "psr/log": "^1.0",
+ "psr/log": "^1.1.2",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
@@ -53,7 +53,6 @@
"ZendTest\\Log\\": "test/"
},
"files": [
- "test/autoload.php",
"test/Writer/TestAsset/chmod.php"
]
},
@@ -62,8 +61,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
},
"zf": {
"component": "Zend\\Log",