summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 5 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 8a96b1f..2c2516a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,9 @@
],
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev",
- "dev-develop": "2.1-dev"
+ "dev-master": "2.1-dev",
+ "dev-develop": "2.2-dev",
+ "dev-dev-3.0.0": "3.0.0-dev"
}
},
"require": {
@@ -25,7 +26,8 @@
"require-dev": {
"phpunit/phpunit": "^4.7",
"squizlabs/php_codesniffer": "^2.3",
- "zendframework/zend-diactoros": "^1.2"
+ "zendframework/zend-diactoros": "^1.2",
+ "mockery/mockery": "^0.9.5"
},
"autoload": {
"psr-4": {