new method with isolated matching logic

Author: fenric

src/Router.php

@@ -24,6 +24,7 @@
 use Sunrise\Http\Router\Exception\RouteAlreadyExistsException;
 use Sunrise\Http\Router\Exception\RouteNotFoundException;
 use Sunrise\Http\Router\Loader\LoaderInterface;
+use Sunrise\Http\Router\RequestHandler\CallableRequestHandler;
 use Sunrise\Http\Router\RequestHandler\QueueableRequestHandler;
 
 /**
@@ -275,6 +276,28 @@ public function match(ServerRequestInterface $request) : RouteInterface
         throw new RouteNotFoundException('Route Not Found');
     }
 
+    /**
+     * Runs the router
+     *
+     * @param ServerRequestInterface $request
+     *
+     * @return ResponseInterface
+     *
+     * @since 2.8.0
+     */
+    public function run(ServerRequestInterface $request) : ResponseInterface
+    {
+        // lazy resolving of the given request...
+        $routing = new CallableRequestHandler(function (ServerRequestInterface $request) : ResponseInterface {
+            return $this->match($request)->handle($request);
+        });
+
+        $handler = new QueueableRequestHandler($routing);
+        $handler->add(...$this->getMiddlewares());
+
+        return $handler->handle($request);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -295,7 +318,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         try {
             return $this->handle($request);
-        } catch (MethodNotAllowedException | RouteNotFoundException $e) {
+        } catch (MethodNotAllowedException|RouteNotFoundException $e) {
             $request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTING_ERROR, $e);
 
             return $handler->handle($request);

tests/RouterTest.php

@@ -12,10 +12,12 @@
 use Sunrise\Http\Router\Exception\MiddlewareAlreadyExistsException;
 use Sunrise\Http\Router\Exception\RouteAlreadyExistsException;
 use Sunrise\Http\Router\Exception\RouteNotFoundException;
+use Sunrise\Http\Router\Middleware\CallableMiddleware;
 use Sunrise\Http\Router\Loader\LoaderInterface;
 use Sunrise\Http\Router\Route;
 use Sunrise\Http\Router\RouteCollection;
 use Sunrise\Http\Router\Router;
+use Sunrise\Http\Message\ResponseFactory;
 use Sunrise\Http\ServerRequest\ServerRequestFactory;
 
 /**
@@ -299,6 +301,84 @@ public function testMatchForUndefinedRoute() : void
         }
     }
 
+    /**
+     * @return void
+     */
+    public function testRun() : void
+    {
+        $routes = [
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+        ];
+
+        $router = new Router();
+        $router->addRoute(...$routes);
+        $router->run((new ServerRequestFactory)
+            ->createServerRequest(
+                $routes[1]->getMethods()[1],
+                $routes[1]->getPath()
+            ));
+
+        $this->assertTrue($routes[1]->getRequestHandler()->isRunned());
+    }
+
+    /**
+     * @return void
+     */
+    public function testRunWithNotAllowedMethod() : void
+    {
+        $routes = [
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+        ];
+
+        $router = new Router();
+        $router->addRoute(...$routes);
+
+        $router->addMiddleware(new CallableMiddleware(function ($request, $handler) {
+            try {
+                return $handler->handle($request);
+            } catch (MethodNotAllowedException $e) {
+                return (new ResponseFactory)->createResponse(405);
+            }
+        }));
+
+        $response = $router->run((new ServerRequestFactory)
+            ->createServerRequest('UNKNOWN', $routes[1]->getPath()));
+
+        $this->assertSame(405, $response->getStatusCode());
+    }
+
+    /**
+     * @return void
+     */
+    public function testRunWithNotFoundRoute() : void
+    {
+        $routes = [
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+            new Fixture\TestRoute(),
+        ];
+
+        $router = new Router();
+        $router->addRoute(...$routes);
+
+        $router->addMiddleware(new CallableMiddleware(function ($request, $handler) {
+            try {
+                return $handler->handle($request);
+            } catch (RouteNotFoundException $e) {
+                return (new ResponseFactory)->createResponse(404);
+            }
+        }));
+
+        $response = $router->run((new ServerRequestFactory)
+            ->createServerRequest($routes[1]->getMethods()[1], '/unknown'));
+
+        $this->assertSame(404, $response->getStatusCode());
+    }
+
     /**
      * @return void
      */