From 63614a74ce262c6c0a3cb0caa4b0fc06ef80a146 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 17 Dec 2015 14:00:24 -0600
Subject: [PATCH 1/2] Prepare for 2.6.0

---
 .travis.yml   |  1 -
 CHANGELOG.md  |  3 ++-
 composer.json | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73f4c148..1ef118c4 100644
--- 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
index 38fb7d63..f7ab5ce3 100644
--- 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
index 2aba75ec..7d2df46e 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-stdlib": "~2.5",
         "zendframework/zend-code": "~2.5"
     },
@@ -21,8 +21,8 @@
     "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"
     }
-}
\ No newline at end of file
+}

From b251d53e6146d77bd939d8485a9b6bc097926f54 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 17 Dec 2015 14:05:06 -0600
Subject: [PATCH 2/2] Removes `src_dir` directive from .coveralls.yml

- per warning received when running it.
---
 .coveralls.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.coveralls.yml b/.coveralls.yml
index 53bda829..bc71b62f 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,3 +1,2 @@
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
-src_dir: src