Merge branch 'hotfix/60-http-method-any-constant' into release-3.0.0

Close #60

CHANGELOG.md

@@ -153,6 +153,10 @@ All notable changes to this project will be documented in this file, in reverse
   list of HTTP methods provided to it is empty. Routes MUST have one or more
   HTTP methods associated.
 
+- [#60](https://github.com/zendframework/zend-expressive-router/pull/60) changes
+  the behavior of the `RouteResult::getAllowedMethods()` to allow a nullable
+  return value; this will return `null` if all methods are allowed.
+
 ### Deprecated
 
 - Nothing.

src/RouteResult.php

@@ -37,7 +37,7 @@
 class RouteResult implements MiddlewareInterface
 {
     /**
-     * @var array
+     * @var null|string[]
      */
     private $allowedMethods = [];
 
@@ -88,14 +88,7 @@ public static function fromRouteFailure(?array $methods) : self
     {
         $result = new self();
         $result->success = false;
-
-        if ($methods === Route::HTTP_METHOD_ANY) {
-            $result->allowedMethods = ['*'];
-        }
-
-        if (is_array($methods)) {
-            $result->allowedMethods = $methods;
-        }
+        $result->allowedMethods = $methods;
 
         return $result;
     }
@@ -180,7 +173,7 @@ public function isFailure() : bool
      */
     public function isMethodFailure() : bool
     {
-        if ($this->isSuccess() || ['*'] === $this->allowedMethods) {
+        if ($this->isSuccess() || $this->allowedMethods === Route::HTTP_METHOD_ANY) {
             return false;
         }
 
@@ -190,9 +183,9 @@ public function isMethodFailure() : bool
     /**
      * Retrieve the allowed methods for the route failure.
      *
-     * @return string[] HTTP methods allowed
+     * @return null|string[] HTTP methods allowed
      */
-    public function getAllowedMethods() : array
+    public function getAllowedMethods() : ?array
     {
         if ($this->isSuccess()) {
             return $this->route

test/RouteResultTest.php

@@ -39,7 +39,7 @@ public function testRouteNameIsNotRetrievable()
     public function testRouteFailureRetrieveAllHttpMethods()
     {
         $result = RouteResult::fromRouteFailure(Route::HTTP_METHOD_ANY);
-        $this->assertSame(['*'], $result->getAllowedMethods());
+        $this->assertSame(Route::HTTP_METHOD_ANY, $result->getAllowedMethods());
     }
 
     public function testRouteFailureRetrieveHttpMethods()
@@ -122,7 +122,7 @@ public function testFailureResultDoesNotIndicateAMethodFailureIfAllMethodsAreAll
     public function testAllowedMethodsIncludesASingleWildcardEntryWhenAllMethodsAllowedForFailureResult(
         RouteResult $result
     ) {
-        $this->assertSame(['*'], $result->getAllowedMethods());
+        $this->assertSame(Route::HTTP_METHOD_ANY, $result->getAllowedMethods());
     }
 
     public function testFailureResultProcessedAsMiddlewareDelegatesToHandler()