Bump minimum versions for dependencies

Update branch aliases
zendframework · Mar 9, 2017 · d92d764 · d92d764
1 parent af64f8b
commit d92d764
Show file tree

Hide file tree

Showing 3 changed files with 2,603 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 vendor/
-composer.lock
-composer.phar
 .buildpath
 .project
 .settings/

diff --git a/composer.json b/composer.json
@@ -26,9 +26,9 @@
         "php": "^5.6 || ^7.0",
         "zendframework/zend-http": "^2.6",
         "zendframework/zendrest": "~2.0",
-        "zendframework/zend-crypt": "~2.0 || ~3.0",
-        "zendframework/zend-json": "~2.0 || ~3.0",
-        "zendframework/zendxml": "~1.0-dev"
+        "zendframework/zend-crypt": "^2.6 || ^3.2",
+        "zendframework/zend-json": "^2.6 || ^3.0",
+        "zendframework/zendxml": "^1.0"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "~1.7.0",
@@ -40,7 +40,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.1.x-dev",
+            "dev-develop": "2.2.x-dev"
         }
     },
     "scripts": {