Fix route matching with same pattern in collection

Author: devanych

src/RouteCollection.php

@@ -104,21 +104,23 @@ public function count(): int
      */
     public function match(ServerRequestInterface $request, bool $checkAllowedMethods = true): ?Route
     {
+        $routeWithNotAllowedMethod = null;
+
         foreach ($this->routes as $route) {
             if (!$route->match($request)) {
                 continue;
             }
 
-            if (!$checkAllowedMethods) {
+            if ($route->isAllowedMethod($request->getMethod())) {
                 return $route;
             }
 
-            if ($route->isAllowedMethod($request->getMethod())) {
-                return $route;
+            if ($routeWithNotAllowedMethod === null) {
+                $routeWithNotAllowedMethod = $route;
             }
         }
 
-        return null;
+        return $checkAllowedMethods ? null : $routeWithNotAllowedMethod;
     }
 
     /**

tests/RouteCollectionTest.php

@@ -189,6 +189,23 @@ public function testMatchWithoutCheckAllowedMethods(): void
         $this->assertNull($this->collection->match($request->withMethod('POST'), false));
     }
 
+    public function testMatchWithoutCheckAllowedMethodsForSamePatternAndNotSameMethod(): void
+    {
+        $handler = fn(): ResponseInterface => new Response();
+        $get = new Route('get', '/test', $handler, ['GET']);
+        $put = new Route('put', '/test', $handler, ['PUT']);
+
+        $this->collection->set($get);
+        $this->collection->set($put);
+        $request = (new ServerRequest())->withUri(new Uri('/test'));
+
+        $this->assertSame($get, $this->collection->match($request->withMethod('GET')));
+        $this->assertSame($get, $this->collection->match($request->withMethod('GET'), false));
+
+        $this->assertSame($put, $this->collection->match($request->withMethod('PUT')));
+        $this->assertSame($put, $this->collection->match($request->withMethod('PUT'), false));
+    }
+
     public function testUrlWithoutHost(): void
     {
         $this->collection->set($this->home);