Merge branch 'versions/2.6.0'

2.6.0 readiness
zendframework · Dec 17, 2015 · 5c62e2c · 5c62e2c
2 parents 784ae10 + b251d53
commit 5c62e2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -1,3 +1,2 @@
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
-src_dir: src
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,4 +20,5 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#2](https://github.com/zendframework/zend-server/pull/2) fixes misleading exception in reflectFunction that referenced reflectClass.
+- [#2](https://github.com/zendframework/zend-server/pull/2) fixes misleading
+  exception in reflectFunction that referenced reflectClass.
diff --git a/composer.json b/composer.json
@@ -13,16 +13,16 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-stdlib": "~2.5",
         "zendframework/zend-code": "~2.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "autoload-dev": {
@@ -31,7 +31,7 @@
         }
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "fabpot/php-cs-fixer": "^1.7.0",
+        "phpunit/PHPUnit": "^4.0"
     }
-}
+}