sunrise-php / http-router

tests/RouteCollectionTest.php

Indentation +327 added lines, -327 removed lines

@@ -21,331 +21,331 @@
 class RouteCollectionTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $collection = new RouteCollection();
-
-        $this->assertInstanceOf(RouteCollectionInterface::class, $collection);
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetDefaultPrefix() : void
-    {
-        $collection = new RouteCollection();
-
-        $this->assertNull($collection->getPrefix());
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetDefaultMiddlewares() : void
-    {
-        $collection = new RouteCollection();
-
-        $this->assertSame([], $collection->getMiddlewares());
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetDefaultRoutes() : void
-    {
-        $collection = new RouteCollection();
-
-        $this->assertSame([], $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetPrefix() : void
-    {
-        $collection = new RouteCollection();
-
-        $this->assertSame($collection, $collection->setPrefix('/foo'));
-        $this->assertSame('/foo', $collection->getPrefix());
-
-        // override prefix...
-        $collection->setPrefix('/bar');
-        $this->assertSame('/bar', $collection->getPrefix());
-
-        // https://github.com/sunrise-php/http-router/issues/26
-        $collection->setPrefix('/baz/');
-        $this->assertSame('/baz', $collection->getPrefix());
-    }
-
-    /**
-     * @return void
-     */
-    public function testAddMiddlewares() : void
-    {
-        $middlewares = [
-            new Fixture\BlankMiddleware(),
-            new Fixture\BlankMiddleware(),
-        ];
-
-        $collection = new RouteCollection();
-
-        $this->assertSame($collection, $collection->addMiddlewares(...$middlewares));
-        $this->assertSame($middlewares, $collection->getMiddlewares());
-
-        // extending...
-        $middlewares[] = new Fixture\BlankMiddleware();
-        $collection->addMiddlewares(end($middlewares));
-        $this->assertSame($middlewares, $collection->getMiddlewares());
-    }
-
-    /**
-     * @return void
-     */
-    public function testAddRoutes() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $collection = new RouteCollection();
-
-        $this->assertSame($collection, $collection->addRoutes(...$routes));
-        $this->assertSame($routes, $collection->getRoutes());
-
-        // extending...
-        $routes[] = new Fixture\TestRoute();
-        $collection->addRoutes(end($routes));
-        $this->assertSame($routes, $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMakeRoute() : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeMethods = Fixture\TestRoute::getTestRouteMethods();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-
-        $collection = new RouteCollection();
-
-        $route = $collection->route(
-            $routeName,
-            $routePath,
-            $routeMethods,
-            $routeRequestHandler
-        );
-
-        $this->assertInstanceOf(RouteInterface::class, $route);
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame($routeMethods, $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame([], $route->getMiddlewares());
-        $this->assertSame([], $route->getAttributes());
-        $this->assertSame([$route], $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMakeRouteWithOptionalParams() : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeMethods = Fixture\TestRoute::getTestRouteMethods();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-        $routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
-        $routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
-
-        $collection = new RouteCollection();
-
-        $route = $collection->route(
-            $routeName,
-            $routePath,
-            $routeMethods,
-            $routeRequestHandler,
-            $routeMiddlewares,
-            $routeAttributes
-        );
-
-        $this->assertInstanceOf(RouteInterface::class, $route);
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame($routeMethods, $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame($routeMiddlewares, $route->getMiddlewares());
-        $this->assertSame($routeAttributes, $route->getAttributes());
-        $this->assertSame([$route], $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMakeRouteWithTransferringPrefix() : void
-    {
-        $collection = new RouteCollection();
-        $collection->setPrefix('/api');
-
-        $route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler());
-        $this->assertSame('/api/foo', $route->getPath());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMakeRouteWithTransferringMiddlewares() : void
-    {
-        $middlewares = [new Fixture\BlankMiddleware()];
-
-        $collection = new RouteCollection();
-        $collection->addMiddlewares(...$middlewares);
-
-        $route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler());
-        $this->assertSame($middlewares, $route->getMiddlewares());
-
-        // merging...
-        $middlewares[] = new Fixture\BlankMiddleware();
-        $route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler(), [end($middlewares)]);
-        $this->assertSame($middlewares, $route->getMiddlewares());
-    }
-
-    /**
-     * @return void
-     *
-     * @dataProvider makeVerbableRoutesDataProvider
-     */
-    public function testMakeVerbableRoutes(string $calledMethod, string $expectedHttpMethod) : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-
-        $collection = new RouteCollection();
-
-        $route = $collection->{$calledMethod}(
-            $routeName,
-            $routePath,
-            $routeRequestHandler
-        );
-
-        $this->assertInstanceOf(RouteInterface::class, $route);
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame([$expectedHttpMethod], $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame([], $route->getMiddlewares());
-        $this->assertSame([], $route->getAttributes());
-        $this->assertSame([$route], $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     *
-     * @dataProvider makeVerbableRoutesDataProvider
-     */
-    public function testMakeVerbableRoutesWithOptionalParams(string $calledMethod, string $expectedHttpMethod) : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-        $routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
-        $routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
-
-        $collection = new RouteCollection();
-
-        $route = $collection->{$calledMethod}(
-            $routeName,
-            $routePath,
-            $routeRequestHandler,
-            $routeMiddlewares,
-            $routeAttributes
-        );
-
-        $this->assertInstanceOf(RouteInterface::class, $route);
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame([$expectedHttpMethod], $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame($routeMiddlewares, $route->getMiddlewares());
-        $this->assertSame($routeAttributes, $route->getAttributes());
-        $this->assertSame([$route], $collection->getRoutes());
-    }
-
-    /**
-     * @return void
-     *
-     * @dataProvider makeVerbableRoutesDataProvider
-     */
-    public function testMakeVerbableRoutesWithTransferringPrefix(string $calledMethod) : void
-    {
-        $collection = new RouteCollection();
-        $collection->setPrefix('/api');
-
-        $route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler());
-        $this->assertSame('/api/foo', $route->getPath());
-    }
-
-    /**
-     * @return void
-     *
-     * @dataProvider makeVerbableRoutesDataProvider
-     */
-    public function testMakeVerbableRoutesWithTransferringMiddlewares(string $calledMethod) : void
-    {
-        $middlewares = [new Fixture\BlankMiddleware()];
-
-        $collection = new RouteCollection();
-        $collection->addMiddlewares(...$middlewares);
-
-        $route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler());
-        $this->assertSame($middlewares, $route->getMiddlewares());
-
-        // merging...
-        $middlewares[] = new Fixture\BlankMiddleware();
-        $route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler(), [end($middlewares)]);
-        $this->assertSame($middlewares, $route->getMiddlewares());
-    }
-
-    /**
-     * @return array
-     */
-    public function makeVerbableRoutesDataProvider() : array
-    {
-        return [
-            [
-                'head',
-                'HEAD',
-            ],
-            [
-                'get',
-                'GET',
-            ],
-            [
-                'post',
-                'POST',
-            ],
-            [
-                'put',
-                'PUT',
-            ],
-            [
-                'patch',
-                'PATCH',
-            ],
-            [
-                'delete',
-                'DELETE',
-            ],
-            [
-                'purge',
-                'PURGE',
-            ],
-        ];
-    }
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$collection = new RouteCollection();
+
+		$this->assertInstanceOf(RouteCollectionInterface::class, $collection);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testGetDefaultPrefix() : void
+	{
+		$collection = new RouteCollection();
+
+		$this->assertNull($collection->getPrefix());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testGetDefaultMiddlewares() : void
+	{
+		$collection = new RouteCollection();
+
+		$this->assertSame([], $collection->getMiddlewares());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testGetDefaultRoutes() : void
+	{
+		$collection = new RouteCollection();
+
+		$this->assertSame([], $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetPrefix() : void
+	{
+		$collection = new RouteCollection();
+
+		$this->assertSame($collection, $collection->setPrefix('/foo'));
+		$this->assertSame('/foo', $collection->getPrefix());
+
+		// override prefix...
+		$collection->setPrefix('/bar');
+		$this->assertSame('/bar', $collection->getPrefix());
+
+		// https://github.com/sunrise-php/http-router/issues/26
+		$collection->setPrefix('/baz/');
+		$this->assertSame('/baz', $collection->getPrefix());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAddMiddlewares() : void
+	{
+		$middlewares = [
+			new Fixture\BlankMiddleware(),
+			new Fixture\BlankMiddleware(),
+		];
+
+		$collection = new RouteCollection();
+
+		$this->assertSame($collection, $collection->addMiddlewares(...$middlewares));
+		$this->assertSame($middlewares, $collection->getMiddlewares());
+
+		// extending...
+		$middlewares[] = new Fixture\BlankMiddleware();
+		$collection->addMiddlewares(end($middlewares));
+		$this->assertSame($middlewares, $collection->getMiddlewares());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAddRoutes() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$collection = new RouteCollection();
+
+		$this->assertSame($collection, $collection->addRoutes(...$routes));
+		$this->assertSame($routes, $collection->getRoutes());
+
+		// extending...
+		$routes[] = new Fixture\TestRoute();
+		$collection->addRoutes(end($routes));
+		$this->assertSame($routes, $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMakeRoute() : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeMethods = Fixture\TestRoute::getTestRouteMethods();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+
+		$collection = new RouteCollection();
+
+		$route = $collection->route(
+			$routeName,
+			$routePath,
+			$routeMethods,
+			$routeRequestHandler
+		);
+
+		$this->assertInstanceOf(RouteInterface::class, $route);
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame($routeMethods, $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame([], $route->getMiddlewares());
+		$this->assertSame([], $route->getAttributes());
+		$this->assertSame([$route], $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMakeRouteWithOptionalParams() : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeMethods = Fixture\TestRoute::getTestRouteMethods();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+		$routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
+		$routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
+
+		$collection = new RouteCollection();
+
+		$route = $collection->route(
+			$routeName,
+			$routePath,
+			$routeMethods,
+			$routeRequestHandler,
+			$routeMiddlewares,
+			$routeAttributes
+		);
+
+		$this->assertInstanceOf(RouteInterface::class, $route);
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame($routeMethods, $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame($routeMiddlewares, $route->getMiddlewares());
+		$this->assertSame($routeAttributes, $route->getAttributes());
+		$this->assertSame([$route], $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMakeRouteWithTransferringPrefix() : void
+	{
+		$collection = new RouteCollection();
+		$collection->setPrefix('/api');
+
+		$route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler());
+		$this->assertSame('/api/foo', $route->getPath());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMakeRouteWithTransferringMiddlewares() : void
+	{
+		$middlewares = [new Fixture\BlankMiddleware()];
+
+		$collection = new RouteCollection();
+		$collection->addMiddlewares(...$middlewares);
+
+		$route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler());
+		$this->assertSame($middlewares, $route->getMiddlewares());
+
+		// merging...
+		$middlewares[] = new Fixture\BlankMiddleware();
+		$route = $collection->route('foo', '/foo', ['GET'], new Fixture\BlankRequestHandler(), [end($middlewares)]);
+		$this->assertSame($middlewares, $route->getMiddlewares());
+	}
+
+	/**
+	 * @return void
+	 *
+	 * @dataProvider makeVerbableRoutesDataProvider
+	 */
+	public function testMakeVerbableRoutes(string $calledMethod, string $expectedHttpMethod) : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+
+		$collection = new RouteCollection();
+
+		$route = $collection->{$calledMethod}(
+			$routeName,
+			$routePath,
+			$routeRequestHandler
+		);
+
+		$this->assertInstanceOf(RouteInterface::class, $route);
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame([$expectedHttpMethod], $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame([], $route->getMiddlewares());
+		$this->assertSame([], $route->getAttributes());
+		$this->assertSame([$route], $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 *
+	 * @dataProvider makeVerbableRoutesDataProvider
+	 */
+	public function testMakeVerbableRoutesWithOptionalParams(string $calledMethod, string $expectedHttpMethod) : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+		$routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
+		$routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
+
+		$collection = new RouteCollection();
+
+		$route = $collection->{$calledMethod}(
+			$routeName,
+			$routePath,
+			$routeRequestHandler,
+			$routeMiddlewares,
+			$routeAttributes
+		);
+
+		$this->assertInstanceOf(RouteInterface::class, $route);
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame([$expectedHttpMethod], $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame($routeMiddlewares, $route->getMiddlewares());
+		$this->assertSame($routeAttributes, $route->getAttributes());
+		$this->assertSame([$route], $collection->getRoutes());
+	}
+
+	/**
+	 * @return void
+	 *
+	 * @dataProvider makeVerbableRoutesDataProvider
+	 */
+	public function testMakeVerbableRoutesWithTransferringPrefix(string $calledMethod) : void
+	{
+		$collection = new RouteCollection();
+		$collection->setPrefix('/api');
+
+		$route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler());
+		$this->assertSame('/api/foo', $route->getPath());
+	}
+
+	/**
+	 * @return void
+	 *
+	 * @dataProvider makeVerbableRoutesDataProvider
+	 */
+	public function testMakeVerbableRoutesWithTransferringMiddlewares(string $calledMethod) : void
+	{
+		$middlewares = [new Fixture\BlankMiddleware()];
+
+		$collection = new RouteCollection();
+		$collection->addMiddlewares(...$middlewares);
+
+		$route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler());
+		$this->assertSame($middlewares, $route->getMiddlewares());
+
+		// merging...
+		$middlewares[] = new Fixture\BlankMiddleware();
+		$route = $collection->{$calledMethod}('foo', '/foo', new Fixture\BlankRequestHandler(), [end($middlewares)]);
+		$this->assertSame($middlewares, $route->getMiddlewares());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function makeVerbableRoutesDataProvider() : array
+	{
+		return [
+			[
+				'head',
+				'HEAD',
+			],
+			[
+				'get',
+				'GET',
+			],
+			[
+				'post',
+				'POST',
+			],
+			[
+				'put',
+				'PUT',
+			],
+			[
+				'patch',
+				'PATCH',
+			],
+			[
+				'delete',
+				'DELETE',
+			],
+			[
+				'purge',
+				'PURGE',
+			],
+		];
+	}
 }

tests/Exception/RouteNotFoundExceptionTest.php

Indentation +9 added lines, -9 removed lines

@@ -16,14 +16,14 @@
 class RouteNotFoundExceptionTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $exception = new RouteNotFoundException();
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$exception = new RouteNotFoundException();
 
-        $this->assertInstanceOf(RuntimeException::class, $exception);
-        $this->assertInstanceOf(ExceptionInterface::class, $exception);
-    }
+		$this->assertInstanceOf(RuntimeException::class, $exception);
+		$this->assertInstanceOf(ExceptionInterface::class, $exception);
+	}
 }

tests/Exception/MethodNotAllowedExceptionTest.php

Indentation +17 added lines, -17 removed lines

@@ -16,24 +16,24 @@
 class MethodNotAllowedExceptionTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $exception = new MethodNotAllowedException([]);
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$exception = new MethodNotAllowedException([]);
 
-        $this->assertInstanceOf(RuntimeException::class, $exception);
-        $this->assertInstanceOf(ExceptionInterface::class, $exception);
-    }
+		$this->assertInstanceOf(RuntimeException::class, $exception);
+		$this->assertInstanceOf(ExceptionInterface::class, $exception);
+	}
 
-    /**
-     * @return void
-     */
-    public function testGetAllowedMethods() : void
-    {
-        $exception = new MethodNotAllowedException(['foo']);
+	/**
+	 * @return void
+	 */
+	public function testGetAllowedMethods() : void
+	{
+		$exception = new MethodNotAllowedException(['foo']);
 
-        $this->assertSame(['foo'], $exception->getAllowedMethods());
-    }
+		$this->assertSame(['foo'], $exception->getAllowedMethods());
+	}
 }

tests/RouteTest.php

Indentation +234 added lines, -234 removed lines

@@ -16,238 +16,238 @@
 class RouteTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeMethods = Fixture\TestRoute::getTestRouteMethods();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-
-        $route = new Route(
-            $routeName,
-            $routePath,
-            $routeMethods,
-            $routeRequestHandler
-        );
-
-        $this->assertInstanceOf(RouteInterface::class, $route);
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame($routeMethods, $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame([], $route->getMiddlewares());
-        $this->assertSame([], $route->getAttributes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testConstructorWithOptionalParams() : void
-    {
-        $routeName = Fixture\TestRoute::getTestRouteName();
-        $routePath = Fixture\TestRoute::getTestRoutePath();
-        $routeMethods = Fixture\TestRoute::getTestRouteMethods();
-        $routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-        $routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
-        $routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
-
-        $route = new Route(
-            $routeName,
-            $routePath,
-            $routeMethods,
-            $routeRequestHandler,
-            $routeMiddlewares,
-            $routeAttributes
-        );
-
-        $this->assertSame($routeName, $route->getName());
-        $this->assertSame($routePath, $route->getPath());
-        $this->assertSame($routeMethods, $route->getMethods());
-        $this->assertSame($routeRequestHandler, $route->getRequestHandler());
-        $this->assertSame($routeMiddlewares, $route->getMiddlewares());
-        $this->assertSame($routeAttributes, $route->getAttributes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetName() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRouteName = Fixture\TestRoute::getTestRouteName();
-
-        $this->assertNotSame($route->getName(), $newRouteName);
-        $this->assertSame($route, $route->setName($newRouteName));
-        $this->assertSame($newRouteName, $route->getName());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetPath() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRoutePath = Fixture\TestRoute::getTestRoutePath();
-
-        $this->assertNotSame($route->getPath(), $newRoutePath);
-        $this->assertSame($route, $route->setPath($newRoutePath));
-        $this->assertSame($newRoutePath, $route->getPath());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetMethods() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRouteMethods = Fixture\TestRoute::getTestRouteMethods();
-
-        $this->assertNotSame($route->getMethods(), $newRouteMethods);
-        $this->assertSame($route, $route->setMethods(...$newRouteMethods));
-        $this->assertSame($newRouteMethods, $route->getMethods());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetLowercasedMethods() : void
-    {
-        $route = new Fixture\TestRoute();
-        $route->setMethods('foo', 'bar');
-
-        $this->assertSame(['FOO', 'BAR'], $route->getMethods());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetRequestHandler() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRouteRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
-
-        $this->assertNotSame($route->getRequestHandler(), $newRouteRequestHandler);
-        $this->assertSame($route, $route->setRequestHandler($newRouteRequestHandler));
-        $this->assertSame($newRouteRequestHandler, $route->getRequestHandler());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetMiddlewares() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRouteMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
-
-        $this->assertNotSame($route->getMiddlewares(), $newRouteMiddlewares);
-        $this->assertSame($route, $route->setMiddlewares(...$newRouteMiddlewares));
-        $this->assertSame($newRouteMiddlewares, $route->getMiddlewares());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetAttributes() : void
-    {
-        $route = new Fixture\TestRoute();
-        $newRouteAttributes = Fixture\TestRoute::getTestRouteAttributes();
-
-        $this->assertNotSame($route->getAttributes(), $newRouteAttributes);
-        $this->assertSame($route, $route->setAttributes($newRouteAttributes));
-        $this->assertSame($newRouteAttributes, $route->getAttributes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testWithAddedAttributes() : void
-    {
-        $route = new Fixture\TestRoute();
-        $extraAttributes = Fixture\TestRoute::getTestRouteAttributes();
-        $expectedAttributes = $route->getAttributes() + $extraAttributes;
-        $routeClone = $route->withAddedAttributes($extraAttributes);
-
-        $this->assertInstanceOf(RouteInterface::class, $routeClone);
-        $this->assertNotSame($route, $routeClone);
-        $this->assertSame($expectedAttributes, $routeClone->getAttributes());
-    }
-
-    /**
-     * @return void
-     */
-    public function testBuildPath() : void
-    {
-        $route = new Fixture\TestRoute();
-
-        $route->setPath('/foo/{bar}');
-        $this->assertSame('/foo/bar', $route->buildPath(['bar' => 'bar']));
-
-        $route->setPath('/foo/{bar<\w+>}');
-        $this->assertSame('/foo/bar', $route->buildPath(['bar' => 'bar'], true));
-
-        $route->setPath('/foo/{bar<\d+>}');
-        $this->assertSame('/foo/100', $route->buildPath(['bar' => 100], true));
-
-        $route = $route->withAddedAttributes(['bar' => 'bar']);
-        $this->assertSame('/foo/100', $route->buildPath(['bar' => 100], true));
-
-        $route = $route->withAddedAttributes(['bar' => 100]);
-        $this->assertSame('/foo/100', $route->buildPath([], true));
-    }
-
-    /**
-     * @return void
-     */
-    public function testBuildPathWithMissingAttribute() : void
-    {
-        $route = new Fixture\TestRoute();
-        $route->setPath('/foo/{bar}/{baz}/quux');
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('[' . $route->getPath() . '] missing attribute "baz".');
-
-        $route->buildPath([
-            'bar' => 'bar',
-        ]);
-    }
-
-    /**
-     * @return void
-     */
-    public function testBuildPathWithInvalidAttributeValue() : void
-    {
-        $route = new Fixture\TestRoute();
-        $route->setPath('/foo/{bar<\w+>}/{baz<\d+>}/quux');
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('[' . $route->getPath() . '] "baz" must match "\d+".');
-
-        $route->buildPath([
-            'bar' => 'bar',
-            'baz' => 'baz',
-        ], true);
-    }
-
-    /**
-      * @return void
-      */
-    public function testBuildRegex() : void
-    {
-        $route = new Fixture\TestRoute();
-
-        $route->setPath('/');
-        $this->assertSame('#^/$#uD', $route->buildRegex());
-
-        $route->setPath('/{foo}');
-        $this->assertSame('#^/(?<foo>[^/]+)$#uD', $route->buildRegex());
-
-        $route->setPath('/{foo}(/{bar})');
-        $this->assertSame('#^/(?<foo>[^/]+)(?:/(?<bar>[^/]+))?$#uD', $route->buildRegex());
-
-        $route->setPath('/{foo}(/{bar})/{baz<\w+>}');
-        $this->assertSame('#^/(?<foo>[^/]+)(?:/(?<bar>[^/]+))?/(?<baz>\w+)$#uD', $route->buildRegex());
-    }
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeMethods = Fixture\TestRoute::getTestRouteMethods();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+
+		$route = new Route(
+			$routeName,
+			$routePath,
+			$routeMethods,
+			$routeRequestHandler
+		);
+
+		$this->assertInstanceOf(RouteInterface::class, $route);
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame($routeMethods, $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame([], $route->getMiddlewares());
+		$this->assertSame([], $route->getAttributes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testConstructorWithOptionalParams() : void
+	{
+		$routeName = Fixture\TestRoute::getTestRouteName();
+		$routePath = Fixture\TestRoute::getTestRoutePath();
+		$routeMethods = Fixture\TestRoute::getTestRouteMethods();
+		$routeRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+		$routeMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
+		$routeAttributes = Fixture\TestRoute::getTestRouteAttributes();
+
+		$route = new Route(
+			$routeName,
+			$routePath,
+			$routeMethods,
+			$routeRequestHandler,
+			$routeMiddlewares,
+			$routeAttributes
+		);
+
+		$this->assertSame($routeName, $route->getName());
+		$this->assertSame($routePath, $route->getPath());
+		$this->assertSame($routeMethods, $route->getMethods());
+		$this->assertSame($routeRequestHandler, $route->getRequestHandler());
+		$this->assertSame($routeMiddlewares, $route->getMiddlewares());
+		$this->assertSame($routeAttributes, $route->getAttributes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetName() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRouteName = Fixture\TestRoute::getTestRouteName();
+
+		$this->assertNotSame($route->getName(), $newRouteName);
+		$this->assertSame($route, $route->setName($newRouteName));
+		$this->assertSame($newRouteName, $route->getName());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetPath() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRoutePath = Fixture\TestRoute::getTestRoutePath();
+
+		$this->assertNotSame($route->getPath(), $newRoutePath);
+		$this->assertSame($route, $route->setPath($newRoutePath));
+		$this->assertSame($newRoutePath, $route->getPath());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetMethods() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRouteMethods = Fixture\TestRoute::getTestRouteMethods();
+
+		$this->assertNotSame($route->getMethods(), $newRouteMethods);
+		$this->assertSame($route, $route->setMethods(...$newRouteMethods));
+		$this->assertSame($newRouteMethods, $route->getMethods());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetLowercasedMethods() : void
+	{
+		$route = new Fixture\TestRoute();
+		$route->setMethods('foo', 'bar');
+
+		$this->assertSame(['FOO', 'BAR'], $route->getMethods());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetRequestHandler() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRouteRequestHandler = Fixture\TestRoute::getTestRouteRequestHandler();
+
+		$this->assertNotSame($route->getRequestHandler(), $newRouteRequestHandler);
+		$this->assertSame($route, $route->setRequestHandler($newRouteRequestHandler));
+		$this->assertSame($newRouteRequestHandler, $route->getRequestHandler());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetMiddlewares() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRouteMiddlewares = Fixture\TestRoute::getTestRouteMiddlewares();
+
+		$this->assertNotSame($route->getMiddlewares(), $newRouteMiddlewares);
+		$this->assertSame($route, $route->setMiddlewares(...$newRouteMiddlewares));
+		$this->assertSame($newRouteMiddlewares, $route->getMiddlewares());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSetAttributes() : void
+	{
+		$route = new Fixture\TestRoute();
+		$newRouteAttributes = Fixture\TestRoute::getTestRouteAttributes();
+
+		$this->assertNotSame($route->getAttributes(), $newRouteAttributes);
+		$this->assertSame($route, $route->setAttributes($newRouteAttributes));
+		$this->assertSame($newRouteAttributes, $route->getAttributes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testWithAddedAttributes() : void
+	{
+		$route = new Fixture\TestRoute();
+		$extraAttributes = Fixture\TestRoute::getTestRouteAttributes();
+		$expectedAttributes = $route->getAttributes() + $extraAttributes;
+		$routeClone = $route->withAddedAttributes($extraAttributes);
+
+		$this->assertInstanceOf(RouteInterface::class, $routeClone);
+		$this->assertNotSame($route, $routeClone);
+		$this->assertSame($expectedAttributes, $routeClone->getAttributes());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testBuildPath() : void
+	{
+		$route = new Fixture\TestRoute();
+
+		$route->setPath('/foo/{bar}');
+		$this->assertSame('/foo/bar', $route->buildPath(['bar' => 'bar']));
+
+		$route->setPath('/foo/{bar<\w+>}');
+		$this->assertSame('/foo/bar', $route->buildPath(['bar' => 'bar'], true));
+
+		$route->setPath('/foo/{bar<\d+>}');
+		$this->assertSame('/foo/100', $route->buildPath(['bar' => 100], true));
+
+		$route = $route->withAddedAttributes(['bar' => 'bar']);
+		$this->assertSame('/foo/100', $route->buildPath(['bar' => 100], true));
+
+		$route = $route->withAddedAttributes(['bar' => 100]);
+		$this->assertSame('/foo/100', $route->buildPath([], true));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testBuildPathWithMissingAttribute() : void
+	{
+		$route = new Fixture\TestRoute();
+		$route->setPath('/foo/{bar}/{baz}/quux');
+
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('[' . $route->getPath() . '] missing attribute "baz".');
+
+		$route->buildPath([
+			'bar' => 'bar',
+		]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testBuildPathWithInvalidAttributeValue() : void
+	{
+		$route = new Fixture\TestRoute();
+		$route->setPath('/foo/{bar<\w+>}/{baz<\d+>}/quux');
+
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('[' . $route->getPath() . '] "baz" must match "\d+".');
+
+		$route->buildPath([
+			'bar' => 'bar',
+			'baz' => 'baz',
+		], true);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testBuildRegex() : void
+	{
+		$route = new Fixture\TestRoute();
+
+		$route->setPath('/');
+		$this->assertSame('#^/$#uD', $route->buildRegex());
+
+		$route->setPath('/{foo}');
+		$this->assertSame('#^/(?<foo>[^/]+)$#uD', $route->buildRegex());
+
+		$route->setPath('/{foo}(/{bar})');
+		$this->assertSame('#^/(?<foo>[^/]+)(?:/(?<bar>[^/]+))?$#uD', $route->buildRegex());
+
+		$route->setPath('/{foo}(/{bar})/{baz<\w+>}');
+		$this->assertSame('#^/(?<foo>[^/]+)(?:/(?<bar>[^/]+))?/(?<baz>\w+)$#uD', $route->buildRegex());
+	}
 }

tests/RouterTest.php

Indentation +341 added lines, -341 removed lines

@@ -28,345 +28,345 @@
 class RouterTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $router = new Router();
-
-        $this->assertInstanceOf(RouteCollection::class, $router);
-        $this->assertInstanceOf(MiddlewareInterface::class, $router);
-        $this->assertInstanceOf(RequestHandlerInterface::class, $router);
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetRoute() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $this->assertSame($routes[0], $router->getRoute($routes[0]->getName()));
-        $this->assertSame($routes[1], $router->getRoute($routes[1]->getName()));
-        $this->assertSame($routes[2], $router->getRoute($routes[2]->getName()));
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetUndefinedRoute() : void
-    {
-        $router = new Router();
-
-        $this->expectException(RouteNotFoundException::class);
-        $router->getRoute('foo');
-    }
-
-    /**
-     * @return void
-     */
-    public function testMatch() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest(
-                $routes[2]->getMethods()[1],
-                $routes[2]->getPath()
-            );
-
-        $foundRoute = $router->match($request);
-
-        $this->assertSame($routes[2]->getName(), $foundRoute->getName());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMatchForUnallowedMethod() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest('GET', '/');
-
-        $this->expectException(MethodNotAllowedException::class);
-
-        try {
-            $router->match($request);
-        } catch (MethodNotAllowedException $e) {
-            $allowedMethods = array_merge(
-                $routes[0]->getMethods(),
-                $routes[1]->getMethods(),
-                $routes[2]->getMethods()
-            );
-
-            $this->assertSame($allowedMethods, $e->getAllowedMethods());
-
-            throw $e;
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function testMatchForUndefinedRoute() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest($routes[0]->getMethods()[0], '/');
-
-        $this->expectException(RouteNotFoundException::class);
-        $router->match($request);
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandle() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest(
-                $routes[2]->getMethods()[1],
-                $routes[2]->getPath()
-            );
-
-        $router->handle($request);
-
-        $this->assertTrue($routes[2]->getRequestHandler()->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandleForUnallowedMethod() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest('GET', '/');
-
-        $this->expectException(MethodNotAllowedException::class);
-
-        try {
-            $router->handle($request);
-        } catch (MethodNotAllowedException $e) {
-            $allowedMethods = array_merge(
-                $routes[0]->getMethods(),
-                $routes[1]->getMethods(),
-                $routes[2]->getMethods()
-            );
-
-            $this->assertSame($allowedMethods, $e->getAllowedMethods());
-
-            throw $e;
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandleForUndefinedRoute() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest($routes[0]->getMethods()[0], '/');
-
-        $this->expectException(RouteNotFoundException::class);
-        $router->handle($request);
-    }
-
-    /**
-     * @return void
-     */
-    public function testProcess() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest(
-                $routes[2]->getMethods()[1],
-                $routes[2]->getPath()
-            );
-
-        $fallback = new Fixture\BlankRequestHandler();
-
-        $router->process($request, $fallback);
-
-        $this->assertTrue($routes[2]->getRequestHandler()->isRunned());
-        $this->assertFalse($fallback->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testProcessForUnallowedMethod() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest('GET', '/');
-
-        $fallback = new Fixture\BlankRequestHandler();
-
-        $router->process($request, $fallback);
-
-        $this->assertInstanceOf(
-            MethodNotAllowedException::class,
-            $fallback->getAttribute(Router::ATTR_NAME_FOR_ROUTING_ERROR)
-        );
-
-        $this->assertTrue($fallback->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testProcessForUndefinedRoute() : void
-    {
-        $routes = [
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-            new Fixture\TestRoute(),
-        ];
-
-        $router = new Router();
-        $router->addRoutes(...$routes);
-
-        $request = (new ServerRequestFactory)
-            ->createServerRequest($routes[0]->getMethods()[0], '/');
-
-        $fallback = new Fixture\BlankRequestHandler();
-
-        $router->process($request, $fallback);
-
-        $this->assertInstanceOf(
-            RouteNotFoundException::class,
-            $fallback->getAttribute(Router::ATTR_NAME_FOR_ROUTING_ERROR)
-        );
-
-        $this->assertTrue($fallback->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testMatchPatterns() : void
-    {
-        $router = new Router();
-        $router->get('test', '/{foo<[0-9]+>}/{bar<[a-zA-Z]+>}(/{baz<.*?>})', new Fixture\BlankRequestHandler());
-
-        $route = $this->discoverRoute($router, 'GET', '/1990/Surgut/Tyumen');
-        $this->assertEquals($route->getAttributes(), [
-            'foo' => '1990',
-            'bar' => 'Surgut',
-            'baz' => 'Tyumen',
-        ]);
-
-        $route = $this->discoverRoute($router, 'GET', '/1990/Surgut/Tyumen/Moscow');
-        $this->assertEquals($route->getAttributes(), [
-            'foo' => '1990',
-            'bar' => 'Surgut',
-            'baz' => 'Tyumen/Moscow',
-        ]);
-
-        $route = $this->discoverRoute($router, 'GET', '/Oops/Surgut/Tyumen/Moscow');
-        $this->assertNull($route);
-
-        $route = $this->discoverRoute($router, 'GET', '/1990/2018/Moscow');
-        $this->assertNull($route);
-    }
-
-    /**
-     * @param Router $router
-     * @param string $method
-     * @param string $uri
-     *
-     * @return null|RouteInterface
-     */
-    private function discoverRoute(Router $router, string $method, string $uri) : ?RouteInterface
-    {
-        $request = (new ServerRequestFactory)
-        ->createServerRequest($method, $uri);
-
-        try {
-            return $router->match($request);
-        } catch (ExceptionInterface $e) {
-            return null;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$router = new Router();
+
+		$this->assertInstanceOf(RouteCollection::class, $router);
+		$this->assertInstanceOf(MiddlewareInterface::class, $router);
+		$this->assertInstanceOf(RequestHandlerInterface::class, $router);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testGetRoute() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$this->assertSame($routes[0], $router->getRoute($routes[0]->getName()));
+		$this->assertSame($routes[1], $router->getRoute($routes[1]->getName()));
+		$this->assertSame($routes[2], $router->getRoute($routes[2]->getName()));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testGetUndefinedRoute() : void
+	{
+		$router = new Router();
+
+		$this->expectException(RouteNotFoundException::class);
+		$router->getRoute('foo');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMatch() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest(
+				$routes[2]->getMethods()[1],
+				$routes[2]->getPath()
+			);
+
+		$foundRoute = $router->match($request);
+
+		$this->assertSame($routes[2]->getName(), $foundRoute->getName());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMatchForUnallowedMethod() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest('GET', '/');
+
+		$this->expectException(MethodNotAllowedException::class);
+
+		try {
+			$router->match($request);
+		} catch (MethodNotAllowedException $e) {
+			$allowedMethods = array_merge(
+				$routes[0]->getMethods(),
+				$routes[1]->getMethods(),
+				$routes[2]->getMethods()
+			);
+
+			$this->assertSame($allowedMethods, $e->getAllowedMethods());
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMatchForUndefinedRoute() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest($routes[0]->getMethods()[0], '/');
+
+		$this->expectException(RouteNotFoundException::class);
+		$router->match($request);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandle() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest(
+				$routes[2]->getMethods()[1],
+				$routes[2]->getPath()
+			);
+
+		$router->handle($request);
+
+		$this->assertTrue($routes[2]->getRequestHandler()->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandleForUnallowedMethod() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest('GET', '/');
+
+		$this->expectException(MethodNotAllowedException::class);
+
+		try {
+			$router->handle($request);
+		} catch (MethodNotAllowedException $e) {
+			$allowedMethods = array_merge(
+				$routes[0]->getMethods(),
+				$routes[1]->getMethods(),
+				$routes[2]->getMethods()
+			);
+
+			$this->assertSame($allowedMethods, $e->getAllowedMethods());
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandleForUndefinedRoute() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest($routes[0]->getMethods()[0], '/');
+
+		$this->expectException(RouteNotFoundException::class);
+		$router->handle($request);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testProcess() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest(
+				$routes[2]->getMethods()[1],
+				$routes[2]->getPath()
+			);
+
+		$fallback = new Fixture\BlankRequestHandler();
+
+		$router->process($request, $fallback);
+
+		$this->assertTrue($routes[2]->getRequestHandler()->isRunned());
+		$this->assertFalse($fallback->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testProcessForUnallowedMethod() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest('GET', '/');
+
+		$fallback = new Fixture\BlankRequestHandler();
+
+		$router->process($request, $fallback);
+
+		$this->assertInstanceOf(
+			MethodNotAllowedException::class,
+			$fallback->getAttribute(Router::ATTR_NAME_FOR_ROUTING_ERROR)
+		);
+
+		$this->assertTrue($fallback->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testProcessForUndefinedRoute() : void
+	{
+		$routes = [
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+			new Fixture\TestRoute(),
+		];
+
+		$router = new Router();
+		$router->addRoutes(...$routes);
+
+		$request = (new ServerRequestFactory)
+			->createServerRequest($routes[0]->getMethods()[0], '/');
+
+		$fallback = new Fixture\BlankRequestHandler();
+
+		$router->process($request, $fallback);
+
+		$this->assertInstanceOf(
+			RouteNotFoundException::class,
+			$fallback->getAttribute(Router::ATTR_NAME_FOR_ROUTING_ERROR)
+		);
+
+		$this->assertTrue($fallback->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMatchPatterns() : void
+	{
+		$router = new Router();
+		$router->get('test', '/{foo<[0-9]+>}/{bar<[a-zA-Z]+>}(/{baz<.*?>})', new Fixture\BlankRequestHandler());
+
+		$route = $this->discoverRoute($router, 'GET', '/1990/Surgut/Tyumen');
+		$this->assertEquals($route->getAttributes(), [
+			'foo' => '1990',
+			'bar' => 'Surgut',
+			'baz' => 'Tyumen',
+		]);
+
+		$route = $this->discoverRoute($router, 'GET', '/1990/Surgut/Tyumen/Moscow');
+		$this->assertEquals($route->getAttributes(), [
+			'foo' => '1990',
+			'bar' => 'Surgut',
+			'baz' => 'Tyumen/Moscow',
+		]);
+
+		$route = $this->discoverRoute($router, 'GET', '/Oops/Surgut/Tyumen/Moscow');
+		$this->assertNull($route);
+
+		$route = $this->discoverRoute($router, 'GET', '/1990/2018/Moscow');
+		$this->assertNull($route);
+	}
+
+	/**
+	 * @param Router $router
+	 * @param string $method
+	 * @param string $uri
+	 *
+	 * @return null|RouteInterface
+	 */
+	private function discoverRoute(Router $router, string $method, string $uri) : ?RouteInterface
+	{
+		$request = (new ServerRequestFactory)
+		->createServerRequest($method, $uri);
+
+		try {
+			return $router->match($request);
+		} catch (ExceptionInterface $e) {
+			return null;
+		}
+	}
 }

src/RouteInterface.php

Indentation +123 added lines, -123 removed lines

@@ -23,127 +23,127 @@
 interface RouteInterface
 {
 
-    /**
-     * Gets the route name
-     *
-     * @return string
-     */
-    public function getName() : string;
-
-    /**
-     * Gets the route path
-     *
-     * @return string
-     */
-    public function getPath() : string;
-
-    /**
-     * Gets the route methods
-     *
-     * @return string[]
-     */
-    public function getMethods() : array;
-
-    /**
-     * Gets the route request handler
-     *
-     * @return RequestHandlerInterface
-     */
-    public function getRequestHandler() : RequestHandlerInterface;
-
-    /**
-     * Gets the route middlewares
-     *
-     * @return MiddlewareInterface[]
-     */
-    public function getMiddlewares() : array;
-
-    /**
-     * Gets the route attributes
-     *
-     * @return array
-     */
-    public function getAttributes() : array;
-
-    /**
-     * Sets the given name to the route
-     *
-     * @param string $name
-     *
-     * @return RouteInterface
-     */
-    public function setName(string $name) : RouteInterface;
-
-    /**
-     * Sets the given path to the route
-     *
-     * @param string $path
-     *
-     * @return RouteInterface
-     */
-    public function setPath(string $path) : RouteInterface;
-
-    /**
-     * Sets the given method(s) to the route
-     *
-     * @param string ...$methods
-     *
-     * @return RouteInterface
-     */
-    public function setMethods(string ...$methods) : RouteInterface;
-
-    /**
-     * Sets the given request handler to the route
-     *
-     * @param RequestHandlerInterface $requestHandler
-     *
-     * @return RouteInterface
-     */
-    public function setRequestHandler(RequestHandlerInterface $requestHandler) : RouteInterface;
-
-    /**
-     * Sets the given middleware(s) to the route
-     *
-     * @param MiddlewareInterface ...$middlewares
-     *
-     * @return RouteInterface
-     */
-    public function setMiddlewares(MiddlewareInterface ...$middlewares) : RouteInterface;
-
-    /**
-     * Sets the given attributes to the route
-     *
-     * @param array $attributes
-     *
-     * @return RouteInterface
-     */
-    public function setAttributes(array $attributes) : RouteInterface;
-
-    /**
-     * Returns the route clone with the given attributes
-     *
-     * This method MUST NOT change the state of the object.
-     *
-     * @param array $attributes
-     *
-     * @return RouteInterface
-     */
-    public function withAddedAttributes(array $attributes) : RouteInterface;
-
-    /**
-     * Builds the route path
-     *
-     * @param array $attributes
-     * @param bool $strict
-     *
-     * @return string
-     */
-    public function buildPath(array $attributes, bool $strict) : string;
-
-    /**
-     * Builds the route regex
-     *
-     * @return string
-     */
-    public function buildRegex() : string;
+	/**
+	 * Gets the route name
+	 *
+	 * @return string
+	 */
+	public function getName() : string;
+
+	/**
+	 * Gets the route path
+	 *
+	 * @return string
+	 */
+	public function getPath() : string;
+
+	/**
+	 * Gets the route methods
+	 *
+	 * @return string[]
+	 */
+	public function getMethods() : array;
+
+	/**
+	 * Gets the route request handler
+	 *
+	 * @return RequestHandlerInterface
+	 */
+	public function getRequestHandler() : RequestHandlerInterface;
+
+	/**
+	 * Gets the route middlewares
+	 *
+	 * @return MiddlewareInterface[]
+	 */
+	public function getMiddlewares() : array;
+
+	/**
+	 * Gets the route attributes
+	 *
+	 * @return array
+	 */
+	public function getAttributes() : array;
+
+	/**
+	 * Sets the given name to the route
+	 *
+	 * @param string $name
+	 *
+	 * @return RouteInterface
+	 */
+	public function setName(string $name) : RouteInterface;
+
+	/**
+	 * Sets the given path to the route
+	 *
+	 * @param string $path
+	 *
+	 * @return RouteInterface
+	 */
+	public function setPath(string $path) : RouteInterface;
+
+	/**
+	 * Sets the given method(s) to the route
+	 *
+	 * @param string ...$methods
+	 *
+	 * @return RouteInterface
+	 */
+	public function setMethods(string ...$methods) : RouteInterface;
+
+	/**
+	 * Sets the given request handler to the route
+	 *
+	 * @param RequestHandlerInterface $requestHandler
+	 *
+	 * @return RouteInterface
+	 */
+	public function setRequestHandler(RequestHandlerInterface $requestHandler) : RouteInterface;
+
+	/**
+	 * Sets the given middleware(s) to the route
+	 *
+	 * @param MiddlewareInterface ...$middlewares
+	 *
+	 * @return RouteInterface
+	 */
+	public function setMiddlewares(MiddlewareInterface ...$middlewares) : RouteInterface;
+
+	/**
+	 * Sets the given attributes to the route
+	 *
+	 * @param array $attributes
+	 *
+	 * @return RouteInterface
+	 */
+	public function setAttributes(array $attributes) : RouteInterface;
+
+	/**
+	 * Returns the route clone with the given attributes
+	 *
+	 * This method MUST NOT change the state of the object.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return RouteInterface
+	 */
+	public function withAddedAttributes(array $attributes) : RouteInterface;
+
+	/**
+	 * Builds the route path
+	 *
+	 * @param array $attributes
+	 * @param bool $strict
+	 *
+	 * @return string
+	 */
+	public function buildPath(array $attributes, bool $strict) : string;
+
+	/**
+	 * Builds the route regex
+	 *
+	 * @return string
+	 */
+	public function buildRegex() : string;
 }

src/Annotation/AnnotationRouteLoader.php

Indentation +129 added lines, -129 removed lines

@@ -35,133 +35,133 @@
 class AnnotationRouteLoader
 {
 
-    /**
-     * @var SimpleAnnotationReader
-     */
-    private $annotationReader;
-
-    /**
-     * @var SplPriorityQueue
-     */
-    private $discoveredAnnotations;
-
-    /**
-     * Constructor of the class
-     */
-    public function __construct()
-    {
-        $this->annotationReader = new SimpleAnnotationReader();
-        $this->annotationReader->addNamespace(__NAMESPACE__);
-
-        $this->discoveredAnnotations = new SplPriorityQueue();
-    }
-
-    /**
-     * Builds discovered routes
-     *
-     * @param null|callable $objectCreator
-     *
-     * @return array
-     */
-    public function buildRoutes(callable $objectCreator = null) : array
-    {
-        $routes = [];
-        foreach ($this->discoveredAnnotations as $annotation) {
-            $requestHandlerClass = $annotation->source->getName();
-            $requestHandler = $objectCreator ? $objectCreator($requestHandlerClass) : new $requestHandlerClass;
-
-            $middlewares = [];
-            foreach ($annotation->middlewares as $middlewareClass) {
-                $middlewares[] = $objectCreator ? $objectCreator($middlewareClass) : new $middlewareClass;
-            }
-
-            $routes[] = new BaseRoute(
-                $annotation->name,
-                $annotation->path,
-                $annotation->methods,
-                $requestHandler,
-                $middlewares,
-                $annotation->attributes
-            );
-        }
-
-        return $routes;
-    }
-
-    /**
-     * Discovers routes in the given destination
-     *
-     * @param string $destination
-     *
-     * @return void
-     */
-    public function discover(string $destination) : void
-    {
-        $annotations = $this->findAnnotations($destination, Route::class);
-
-        foreach ($annotations as $annotation) {
-            $this->discoveredAnnotations->insert($annotation, $annotation->priority);
-        }
-    }
-
-    /**
-     * Finds annotations in the given destination
-     *
-     * @param string $destination
-     * @param string $name
-     *
-     * @return array
-     */
-    private function findAnnotations(string $destination, string $name) : array
-    {
-        $classes = $this->findClasses($destination);
-        $annotations = [];
-
-        foreach ($classes as $class) {
-            $class = new ReflectionClass($class);
-            $annotation = $this->annotationReader->getClassAnnotation($class, $name);
-
-            if ($annotation instanceof $name) {
-                $annotation->source = $class;
-                $annotations[] = $annotation;
-            }
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * Finds classes in the given destination
-     *
-     * @param string $destination
-     *
-     * @return array
-     */
-    private function findClasses(string $destination) : array
-    {
-        $files = $this->findFiles($destination);
-        $classes = get_declared_classes();
-
-        foreach ($files as $file) {
-            require_once $file->getRealPath();
-        }
-
-        return array_diff(get_declared_classes(), $classes);
-    }
-
-    /**
-     * Finds files in the given destination
-     *
-     * @param string $destination
-     *
-     * @return array
-     */
-    private function findFiles(string $destination) : array
-    {
-        $directory = new RecursiveDirectoryIterator($destination);
-        $iterator = new RecursiveIteratorIterator($directory);
-        $files = new RegexIterator($iterator, '/\.php$/');
-
-        return iterator_to_array($files);
-    }
+	/**
+	 * @var SimpleAnnotationReader
+	 */
+	private $annotationReader;
+
+	/**
+	 * @var SplPriorityQueue
+	 */
+	private $discoveredAnnotations;
+
+	/**
+	 * Constructor of the class
+	 */
+	public function __construct()
+	{
+		$this->annotationReader = new SimpleAnnotationReader();
+		$this->annotationReader->addNamespace(__NAMESPACE__);
+
+		$this->discoveredAnnotations = new SplPriorityQueue();
+	}
+
+	/**
+	 * Builds discovered routes
+	 *
+	 * @param null|callable $objectCreator
+	 *
+	 * @return array
+	 */
+	public function buildRoutes(callable $objectCreator = null) : array
+	{
+		$routes = [];
+		foreach ($this->discoveredAnnotations as $annotation) {
+			$requestHandlerClass = $annotation->source->getName();
+			$requestHandler = $objectCreator ? $objectCreator($requestHandlerClass) : new $requestHandlerClass;
+
+			$middlewares = [];
+			foreach ($annotation->middlewares as $middlewareClass) {
+				$middlewares[] = $objectCreator ? $objectCreator($middlewareClass) : new $middlewareClass;
+			}
+
+			$routes[] = new BaseRoute(
+				$annotation->name,
+				$annotation->path,
+				$annotation->methods,
+				$requestHandler,
+				$middlewares,
+				$annotation->attributes
+			);
+		}
+
+		return $routes;
+	}
+
+	/**
+	 * Discovers routes in the given destination
+	 *
+	 * @param string $destination
+	 *
+	 * @return void
+	 */
+	public function discover(string $destination) : void
+	{
+		$annotations = $this->findAnnotations($destination, Route::class);
+
+		foreach ($annotations as $annotation) {
+			$this->discoveredAnnotations->insert($annotation, $annotation->priority);
+		}
+	}
+
+	/**
+	 * Finds annotations in the given destination
+	 *
+	 * @param string $destination
+	 * @param string $name
+	 *
+	 * @return array
+	 */
+	private function findAnnotations(string $destination, string $name) : array
+	{
+		$classes = $this->findClasses($destination);
+		$annotations = [];
+
+		foreach ($classes as $class) {
+			$class = new ReflectionClass($class);
+			$annotation = $this->annotationReader->getClassAnnotation($class, $name);
+
+			if ($annotation instanceof $name) {
+				$annotation->source = $class;
+				$annotations[] = $annotation;
+			}
+		}
+
+		return $annotations;
+	}
+
+	/**
+	 * Finds classes in the given destination
+	 *
+	 * @param string $destination
+	 *
+	 * @return array
+	 */
+	private function findClasses(string $destination) : array
+	{
+		$files = $this->findFiles($destination);
+		$classes = get_declared_classes();
+
+		foreach ($files as $file) {
+			require_once $file->getRealPath();
+		}
+
+		return array_diff(get_declared_classes(), $classes);
+	}
+
+	/**
+	 * Finds files in the given destination
+	 *
+	 * @param string $destination
+	 *
+	 * @return array
+	 */
+	private function findFiles(string $destination) : array
+	{
+		$directory = new RecursiveDirectoryIterator($destination);
+		$iterator = new RecursiveIteratorIterator($directory);
+		$files = new RegexIterator($iterator, '/\.php$/');
+
+		return iterator_to_array($files);
+	}
 }

src/Annotation/Route.php

Indentation +89 added lines, -89 removed lines

@@ -33,93 +33,93 @@
 final class Route
 {
 
-    /**
-     * @var object
-     */
-    public $source;
-
-    /**
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @var string
-     */
-    public $path;
-
-    /**
-     * @var array
-     */
-    public $methods;
-
-    /**
-     * @var array
-     */
-    public $middlewares = [];
-
-    /**
-     * @var array
-     */
-    public $attributes = [];
-
-    /**
-     * @var int
-     */
-    public $priority = 0;
-
-    /**
-     * @param array $params
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(array $params)
-    {
-        if (empty($params['name']) || !is_string($params['name'])) {
-            throw new InvalidArgumentException('@Route.name must be not an empty string.');
-        }
-        if (empty($params['path']) || !is_string($params['path'])) {
-            throw new InvalidArgumentException('@Route.path must be not an empty string.');
-        }
-        if (empty($params['methods']) || !is_array($params['methods'])) {
-            throw new InvalidArgumentException('@Route.methods must be not an empty array.');
-        }
-        if (isset($params['middlewares']) && !is_array($params['middlewares'])) {
-            throw new InvalidArgumentException('@Route.middlewares must be an array.');
-        }
-        if (isset($params['attributes']) && !is_array($params['attributes'])) {
-            throw new InvalidArgumentException('@Route.attributes must be an array.');
-        }
-        if (isset($params['priority']) && !is_int($params['priority'])) {
-            throw new InvalidArgumentException('@Route.priority must be an integer.');
-        }
-
-        foreach ($params['methods'] as $v) {
-            if (!is_string($v)) {
-                throw new InvalidArgumentException('@Route.methods must contain only strings.');
-            }
-        }
-
-        if (isset($params['middlewares'])) {
-            foreach ($params['middlewares'] as $v) {
-                if (!is_string($v) || !class_exists($v) || !is_subclass_of($v, MiddlewareInterface::class)) {
-                    throw new InvalidArgumentException('@Route.middlewares must contain only middlewares.');
-                }
-            }
-        }
-
-        $this->name = $params['name'];
-        $this->path = $params['path'];
-        $this->methods = $params['methods'];
-
-        if (isset($params['middlewares'])) {
-            $this->middlewares = $params['middlewares'];
-        }
-        if (isset($params['attributes'])) {
-            $this->attributes = $params['attributes'];
-        }
-        if (isset($params['priority'])) {
-            $this->priority = $params['priority'];
-        }
-    }
+	/**
+	 * @var object
+	 */
+	public $source;
+
+	/**
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * @var string
+	 */
+	public $path;
+
+	/**
+	 * @var array
+	 */
+	public $methods;
+
+	/**
+	 * @var array
+	 */
+	public $middlewares = [];
+
+	/**
+	 * @var array
+	 */
+	public $attributes = [];
+
+	/**
+	 * @var int
+	 */
+	public $priority = 0;
+
+	/**
+	 * @param array $params
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(array $params)
+	{
+		if (empty($params['name']) || !is_string($params['name'])) {
+			throw new InvalidArgumentException('@Route.name must be not an empty string.');
+		}
+		if (empty($params['path']) || !is_string($params['path'])) {
+			throw new InvalidArgumentException('@Route.path must be not an empty string.');
+		}
+		if (empty($params['methods']) || !is_array($params['methods'])) {
+			throw new InvalidArgumentException('@Route.methods must be not an empty array.');
+		}
+		if (isset($params['middlewares']) && !is_array($params['middlewares'])) {
+			throw new InvalidArgumentException('@Route.middlewares must be an array.');
+		}
+		if (isset($params['attributes']) && !is_array($params['attributes'])) {
+			throw new InvalidArgumentException('@Route.attributes must be an array.');
+		}
+		if (isset($params['priority']) && !is_int($params['priority'])) {
+			throw new InvalidArgumentException('@Route.priority must be an integer.');
+		}
+
+		foreach ($params['methods'] as $v) {
+			if (!is_string($v)) {
+				throw new InvalidArgumentException('@Route.methods must contain only strings.');
+			}
+		}
+
+		if (isset($params['middlewares'])) {
+			foreach ($params['middlewares'] as $v) {
+				if (!is_string($v) || !class_exists($v) || !is_subclass_of($v, MiddlewareInterface::class)) {
+					throw new InvalidArgumentException('@Route.middlewares must contain only middlewares.');
+				}
+			}
+		}
+
+		$this->name = $params['name'];
+		$this->path = $params['path'];
+		$this->methods = $params['methods'];
+
+		if (isset($params['middlewares'])) {
+			$this->middlewares = $params['middlewares'];
+		}
+		if (isset($params['attributes'])) {
+			$this->attributes = $params['attributes'];
+		}
+		if (isset($params['priority'])) {
+			$this->priority = $params['priority'];
+		}
+	}
 }

src/RequestHandler/RoutableRequestHandler.php

Indentation +34 added lines, -34 removed lines

@@ -25,45 +25,45 @@
 class RoutableRequestHandler implements RequestHandlerInterface
 {
 
-    /**
-     * Server Request attribute name for a route name
-     *
-     * @var string
-     */
-    public const ATTR_NAME_FOR_ROUTE_NAME = '@route-name';
+	/**
+	 * Server Request attribute name for a route name
+	 *
+	 * @var string
+	 */
+	public const ATTR_NAME_FOR_ROUTE_NAME = '@route-name';
 
-    /**
-     * The request handler route
-     *
-     * @var RouteInterface
-     */
-    private $route;
+	/**
+	 * The request handler route
+	 *
+	 * @var RouteInterface
+	 */
+	private $route;
 
-    /**
-     * Constructor of the class
-     *
-     * @param RouteInterface $route
-     */
-    public function __construct(RouteInterface $route)
-    {
-        $this->route = $route;
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param RouteInterface $route
+	 */
+	public function __construct(RouteInterface $route)
+	{
+		$this->route = $route;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTE_NAME, $this->route->getName());
+	/**
+	 * {@inheritDoc}
+	 */
+	public function handle(ServerRequestInterface $request) : ResponseInterface
+	{
+		$request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTE_NAME, $this->route->getName());
 
-        foreach ($this->route->getAttributes() as $key => $value) {
-            $request = $request->withAttribute($key, $value);
-        }
+		foreach ($this->route->getAttributes() as $key => $value) {
+			$request = $request->withAttribute($key, $value);
+		}
 
-        $handler = new QueueableRequestHandler($this->route->getRequestHandler());
+		$handler = new QueueableRequestHandler($this->route->getRequestHandler());
 
-        $handler->add(...$this->route->getMiddlewares());
+		$handler->add(...$this->route->getMiddlewares());
 
-        return $handler->handle($request);
-    }
+		return $handler->handle($request);
+	}
 }