Merge branch 'hotfix/zend-expressive-router-rc4' into release-3.0.0

Close #51
zendframework · Mar 7, 2018 · 43fac9a · 43fac9a
2 parents ab9667c + 95954c4
commit 43fac9a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0rc4 - 2018-03-07
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#51](https://github.com/zendframework/zend-expressive-fastroute/pull/51)
+  updates the minimum supported version of zend-expressive-router to 3.0.0rc4.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 3.0.0rc3 - 2018-03-07
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "nikic/fast-route": "^1.2",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-router": "^3.0.0rc3",
+        "zendframework/zend-expressive-router": "^3.0.0rc4",
         "zendframework/zend-stdlib": "^2.0 || ^3.1"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/FastRouteRouterTest.php b/test/FastRouteRouterTest.php
@@ -334,7 +334,7 @@ public function testMatchFailureNotDueToHttpMethodReturnsGenericRouteFailureResu
         $this->assertInstanceOf(RouteResult::class, $result);
         $this->assertTrue($result->isFailure());
         $this->assertFalse($result->isMethodFailure());
-        $this->assertSame(['*'], $result->getAllowedMethods());
+        $this->assertSame(Route::HTTP_METHOD_ANY, $result->getAllowedMethods());
     }
 
     public function generatedUriProvider()