Merging develop to master in preparation for 1.2.0 release.

Author: weierophinney

.travis.yml

@@ -10,11 +10,10 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
     - php: 5.6
+    - php: 7
       env:
         - EXECUTE_CS_CHECK=true
-    - php: 7
     - php: hhvm 
   allow_failures:
     - php: hhvm

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.2.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- This release removes support for PHP 5.5.
+
+### Fixed
+
+- [#7](https://github.com/zendframework/zend-expressive-zendrouter/pull/7)
+  updates the zend-router dependency to `^3.0`; this also required changing
+  which routes and routers are imported internally to use the new namespace
+  introduced in that version. The changes should have no effect on existing
+  code, except that they will result in dependency updates.
+
 ## 1.1.1 - TBD
 
 ### Added

composer.json

@@ -18,15 +18,15 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "psr/http-message": "^1.0",
-        "zendframework/zend-expressive-router": "^1.0",
-        "zendframework/zend-router": "^2.5",
-        "zendframework/zend-psr7bridge": "^0.2.0"
+        "zendframework/zend-expressive-router": "^1.2",
+        "zendframework/zend-router": "^3.0",
+        "zendframework/zend-psr7bridge": "^0.2.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.7",
-        "squizlabs/php_codesniffer": "^2.3"
+        "phpunit/phpunit": "^4.8",
+        "squizlabs/php_codesniffer": "^2.6.2"
     },
     "autoload": {
       "psr-4": {

phpcs.xml

@@ -9,6 +9,12 @@
     <!-- inherit rules from: -->
     <rule ref="PSR2"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>

src/ZendRouter.php

@@ -11,8 +11,8 @@
 
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Zend\Expressive\Exception;
-use Zend\Mvc\Router\Http\TreeRouteStack;
-use Zend\Mvc\Router\RouteMatch;
+use Zend\Router\Http\TreeRouteStack;
+use Zend\Router\RouteMatch;
 use Zend\Psr7Bridge\Psr7ServerRequest;
 
 /**

test/ZendRouterTest.php

@@ -16,8 +16,8 @@
 use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Router\ZendRouter;
 use Zend\Http\Request as ZendRequest;
-use Zend\Mvc\Router\Http\TreeRouteStack;
-use Zend\Mvc\Router\RouteMatch;
+use Zend\Router\Http\TreeRouteStack;
+use Zend\Router\RouteMatch;
 
 class ZendRouterTest extends TestCase
 {