Merge 9c5dfc1 into 97ea994

zendframework · Mar 7, 2018 · 5b63539 · 5b63539
2 parents 97ea994 + 9c5dfc1
commit 5b63539
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -160,6 +160,12 @@ public function getOptions() : array
      */
     private function validateHttpMethods(array $methods) : array
     {
+        if (empty($methods)) {
+            throw new Exception\InvalidArgumentException(
+                'HTTP methods argument was empty; must contain at least one method'
+            );
+        }
+
         if (false === array_reduce($methods, function ($valid, $method) {
             if (false === $valid) {
                 return false;

diff --git a/test/Middleware/PathBasedRoutingMiddlewareTest.php b/test/Middleware/PathBasedRoutingMiddlewareTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Expressive\Router\Middleware;
 
+use Fig\Http\Message\RequestMethodInterface as RequestMethod;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -72,11 +73,11 @@ public function process(
     public function commonHttpMethods()
     {
         return [
-            'GET'    => ['GET'],
-            'POST'   => ['POST'],
-            'PUT'    => ['PUT'],
-            'PATCH'  => ['PATCH'],
-            'DELETE' => ['DELETE'],
+            RequestMethod::METHOD_GET    => [RequestMethod::METHOD_GET],
+            RequestMethod::METHOD_POST   => [RequestMethod::METHOD_POST],
+            RequestMethod::METHOD_PUT    => [RequestMethod::METHOD_PUT],
+            RequestMethod::METHOD_PATCH  => [RequestMethod::METHOD_PATCH],
+            RequestMethod::METHOD_DELETE => [RequestMethod::METHOD_DELETE],
         ];
     }
 
@@ -178,7 +179,7 @@ public function testCommonHttpMethodsAreExposedAsClassMethodsAndReturnRoutes($me
     public function testCreatingHttpRouteMethodWithExistingPathButDifferentMethodCreatesNewRouteInstance()
     {
         $this->router->addRoute(Argument::type(Route::class))->shouldBeCalledTimes(2);
-        $route = $this->middleware->route('/foo', $this->noopMiddleware, []);
+        $route = $this->middleware->route('/foo', $this->noopMiddleware, [RequestMethod::METHOD_POST]);
 
         $middleware = $this->createNoopMiddleware();
         $test = $this->middleware->get('/foo', $middleware);

diff --git a/test/RouteTest.php b/test/RouteTest.php
@@ -71,13 +71,13 @@ public function testRouteCanMatchMethod()
 
     public function testRouteHeadMethodIsNotAllowedByDefault()
     {
-        $route = new Route('/foo', $this->noopMiddleware, []);
+        $route = new Route('/foo', $this->noopMiddleware, [RequestMethod::METHOD_GET]);
         $this->assertFalse($route->allowsMethod(RequestMethod::METHOD_HEAD));
     }
 
     public function testRouteOptionsMethodIsNotAllowedByDefault()
     {
-        $route = new Route('/foo', $this->noopMiddleware, []);
+        $route = new Route('/foo', $this->noopMiddleware, [RequestMethod::METHOD_GET]);
         $this->assertFalse($route->allowsMethod(RequestMethod::METHOD_OPTIONS));
     }
 
@@ -103,7 +103,7 @@ public function testRouteNameForRouteAcceptingAnyMethodMatchesPathByDefault()
 
     public function testRouteNameWithConstructor()
     {
-        $route = new Route('/test', $this->noopMiddleware, [], 'test');
+        $route = new Route('/test', $this->noopMiddleware, [RequestMethod::METHOD_GET], 'test');
         $this->assertSame('test', $route->getName());
     }
 
@@ -116,7 +116,7 @@ public function testRouteNameWithGET()
     public function testRouteNameWithGetAndPost()
     {
         $route = new Route('/test', $this->noopMiddleware, [RequestMethod::METHOD_GET, RequestMethod::METHOD_POST]);
-        $this->assertSame('/test^GET' . Route::HTTP_METHOD_SEPARATOR . 'POST', $route->getName());
+        $this->assertSame('/test^GET' . Route::HTTP_METHOD_SEPARATOR . RequestMethod::METHOD_POST, $route->getName());
     }
 
     public function testThrowsExceptionDuringConstructionIfPathIsNotString()
@@ -230,4 +230,13 @@ public function testRouteIsMiddlewareAndProxiesToComposedMiddleware()
         $route = new Route('/foo', $middleware->reveal());
         $this->assertSame($response, $route->process($request, $handler));
     }
+
+    public function testConstructorShouldRaiseExceptionIfMethodsArgumentIsAnEmptyArray()
+    {
+        $middleware = $this->prophesize(MiddlewareInterface::class)->reveal();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('empty');
+        new Route('/foo', $middleware, []);
+    }
 }