Merge branch 'hotfix/32-route-result-failure-arguments' into release-…

…3.0.0

Close #32

src/ZendRouter.php

@@ -166,7 +166,7 @@ private function marshalSuccessResultFromRouteMatch(RouteMatch $match, PsrReques
             // This should never happen, as Zend\Expressive\Router\Route always
             // ensures a non-empty route name. Marking as failed route to be
             // consistent with other implementations.
-            return RouteResult::fromRouteFailure();
+            return RouteResult::fromRouteFailure(Route::HTTP_METHOD_ANY);
         }
 
         return RouteResult::fromRoute($route, $params);

test/ZendRouterTest.php

@@ -21,6 +21,7 @@
 use Zend\Expressive\Router\ZendRouter;
 use Zend\Http\Request as ZendRequest;
 use Zend\I18n\Translator\TranslatorInterface;
+use Zend\Psr7Bridge\Psr7ServerRequest;
 use Zend\Router\Http\TreeRouteStack;
 use Zend\Router\RouteMatch;
 
@@ -266,6 +267,27 @@ public function testMatch()
         $this->assertEquals($middleware, $result->getMatchedMiddleware());
     }
 
+    public function testReturnsRouteFailureForRouteInjectedManuallyIntoBaseRouterButNotRouterBridge()
+    {
+        $uri = $this->prophesize(UriInterface::class);
+        $uri->getPath()->willReturn('/foo');
+
+        $request = new ServerRequest(['REQUEST_METHOD' => 'GET'], [], '/foo', 'GET');
+        $zendRequest = Psr7ServerRequest::toZend($request);
+
+        $routeMatch = new \Zend\Router\Http\RouteMatch([], 4);
+        $routeMatch->setMatchedRouteName('/foo');
+
+        $this->zendRouter->match($zendRequest)->willReturn($routeMatch);
+
+        $router = $this->getRouter();
+        $result = $router->match($request);
+
+        $this->assertInstanceOf(RouteResult::class, $result);
+        $this->assertTrue($result->isFailure());
+        $this->assertFalse($result->isMethodFailure());
+    }
+
     public function testMatchedRouteNameNoAllowedMethods()
     {
         $middleware = $this->getMiddleware();