sunrise-php / http-router

tests/Fixture/BlankRequestHandler.php

Indentation +51 added lines, -51 removed lines

@@ -16,62 +16,62 @@
 class BlankRequestHandler implements RequestHandlerInterface
 {
 
-    /**
-     * @var bool
-     */
-    private $isRunned = false;
+	/**
+	 * @var bool
+	 */
+	private $isRunned = false;
 
-    /**
-     * @var array
-     */
-    private $attributes = [];
+	/**
+	 * @var array
+	 */
+	private $attributes = [];
 
-    /**
-     * @return bool
-     */
-    public function isRunned() : bool
-    {
-        return $this->isRunned;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRunned() : bool
+	{
+		return $this->isRunned;
+	}
 
-    /**
-     * @return array
-     */
-    public function getAttributes() : array
-    {
-        return $this->attributes;
-    }
+	/**
+	 * @return array
+	 */
+	public function getAttributes() : array
+	{
+		return $this->attributes;
+	}
 
-    /**
-     * @param mixed $key
-     *
-     * @return mixed
-     */
-    public function getAttribute($key)
-    {
-        return $this->attributes[$key] ?? null;
-    }
+	/**
+	 * @param mixed $key
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute($key)
+	{
+		return $this->attributes[$key] ?? null;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $this->isRunned = true;
-        $this->attributes = $request->getAttributes();
+	/**
+	 * {@inheritDoc}
+	 */
+	public function handle(ServerRequestInterface $request) : ResponseInterface
+	{
+		$this->isRunned = true;
+		$this->attributes = $request->getAttributes();
 
-        return (new ResponseFactory)->createResponse();
-    }
+		return (new ResponseFactory)->createResponse();
+	}
 
-    /**
-     * @param ServerRequestInterface $request
-     *
-     * @return ResponseInterface
-     *
-     * @link https://www.php.net/manual/ru/language.oop5.magic.php#object.invoke
-     */
-    public function __invoke(ServerRequestInterface $request) : ResponseInterface
-    {
-        return $this->handle($request);
-    }
+	/**
+	 * @param ServerRequestInterface $request
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @link https://www.php.net/manual/ru/language.oop5.magic.php#object.invoke
+	 */
+	public function __invoke(ServerRequestInterface $request) : ResponseInterface
+	{
+		return $this->handle($request);
+	}
 }

tests/Fixture/TestRoute.php

Indentation +77 added lines, -77 removed lines

@@ -21,91 +21,91 @@
 class TestRoute extends BaseRoute
 {
 
-    /**
-     * @var int
-     */
-    public const WITH_BROKEN_MIDDLEWARE = 1;
+	/**
+	 * @var int
+	 */
+	public const WITH_BROKEN_MIDDLEWARE = 1;
 
-    /**
-     * Constructor of the class
-     *
-     * @param int $flags
-     */
-    public function __construct(int $flags = 0)
-    {
-        parent::__construct(
-            self::getTestRouteName($flags),
-            self::getTestRoutePath($flags),
-            self::getTestRouteMethods($flags),
-            self::getTestRouteRequestHandler($flags),
-            self::getTestRouteMiddlewares($flags),
-            self::getTestRouteAttributes($flags)
-        );
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param int $flags
+	 */
+	public function __construct(int $flags = 0)
+	{
+		parent::__construct(
+			self::getTestRouteName($flags),
+			self::getTestRoutePath($flags),
+			self::getTestRouteMethods($flags),
+			self::getTestRouteRequestHandler($flags),
+			self::getTestRouteMiddlewares($flags),
+			self::getTestRouteAttributes($flags)
+		);
+	}
 
-    /**
-     * @return string
-     */
-    public static function getTestRouteName(int $flags = 0) : string
-    {
-        return uniqid() . '.' . uniqid() . '.' . uniqid();
-    }
+	/**
+	 * @return string
+	 */
+	public static function getTestRouteName(int $flags = 0) : string
+	{
+		return uniqid() . '.' . uniqid() . '.' . uniqid();
+	}
 
-    /**
-     * @return string
-     */
-    public static function getTestRoutePath(int $flags = 0) : string
-    {
-        return '/' . uniqid() . '/' . uniqid() . '/' . uniqid();
-    }
+	/**
+	 * @return string
+	 */
+	public static function getTestRoutePath(int $flags = 0) : string
+	{
+		return '/' . uniqid() . '/' . uniqid() . '/' . uniqid();
+	}
 
-    /**
-     * @return string[]
-     */
-    public static function getTestRouteMethods(int $flags = 0) : array
-    {
-        return [
-            strtoupper(uniqid()),
-            strtoupper(uniqid()),
-            strtoupper(uniqid()),
-        ];
-    }
+	/**
+	 * @return string[]
+	 */
+	public static function getTestRouteMethods(int $flags = 0) : array
+	{
+		return [
+			strtoupper(uniqid()),
+			strtoupper(uniqid()),
+			strtoupper(uniqid()),
+		];
+	}
 
-    /**
-     * @return RequestHandlerInterface
-     */
-    public static function getTestRouteRequestHandler(int $flags = 0) : RequestHandlerInterface
-    {
-        return new BlankRequestHandler();
-    }
+	/**
+	 * @return RequestHandlerInterface
+	 */
+	public static function getTestRouteRequestHandler(int $flags = 0) : RequestHandlerInterface
+	{
+		return new BlankRequestHandler();
+	}
 
-    /**
-     * @return MiddlewareInterface[]
-     */
-    public static function getTestRouteMiddlewares(int $flags = 0) : array
-    {
-        $middlewares = [new BlankMiddleware()];
+	/**
+	 * @return MiddlewareInterface[]
+	 */
+	public static function getTestRouteMiddlewares(int $flags = 0) : array
+	{
+		$middlewares = [new BlankMiddleware()];
 
-        if ($flags & self::WITH_BROKEN_MIDDLEWARE) {
-            $middlewares[] = new BlankMiddleware(true);
-        } else {
-            $middlewares[] = new BlankMiddleware();
-        }
+		if ($flags & self::WITH_BROKEN_MIDDLEWARE) {
+			$middlewares[] = new BlankMiddleware(true);
+		} else {
+			$middlewares[] = new BlankMiddleware();
+		}
 
-        $middlewares[] = new BlankMiddleware();
+		$middlewares[] = new BlankMiddleware();
 
-        return $middlewares;
-    }
+		return $middlewares;
+	}
 
-    /**
-     * @return array
-     */
-    public static function getTestRouteAttributes(int $flags = 0) : array
-    {
-        return [
-            uniqid() => uniqid(),
-            uniqid() => uniqid(),
-            uniqid() => uniqid(),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public static function getTestRouteAttributes(int $flags = 0) : array
+	{
+		return [
+			uniqid() => uniqid(),
+			uniqid() => uniqid(),
+			uniqid() => uniqid(),
+		];
+	}
 }

tests/Fixture/BlankMiddleware.php

Indentation +40 added lines, -40 removed lines

@@ -17,51 +17,51 @@
 class BlankMiddleware implements MiddlewareInterface
 {
 
-    /**
-     * @var bool
-     */
-    private $isBroken;
+	/**
+	 * @var bool
+	 */
+	private $isBroken;
 
-    /**
-     * @var bool
-     */
-    private $isRunned = false;
+	/**
+	 * @var bool
+	 */
+	private $isRunned = false;
 
-    /**
-     * @param bool $isBroken
-     */
-    public function __construct(bool $isBroken = false)
-    {
-        $this->isBroken = $isBroken;
-    }
+	/**
+	 * @param bool $isBroken
+	 */
+	public function __construct(bool $isBroken = false)
+	{
+		$this->isBroken = $isBroken;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isBroken() : bool
-    {
-        return $this->isBroken;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isBroken() : bool
+	{
+		return $this->isBroken;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isRunned() : bool
-    {
-        return $this->isRunned;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRunned() : bool
+	{
+		return $this->isRunned;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->isRunned = true;
+	/**
+	 * {@inheritDoc}
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+	{
+		$this->isRunned = true;
 
-        if ($this->isBroken) {
-            return (new ResponseFactory)->createResponse();
-        }
+		if ($this->isBroken) {
+			return (new ResponseFactory)->createResponse();
+		}
 
-        return $handler->handle($request);
-    }
+		return $handler->handle($request);
+	}
 }

tests/RequestHandler/CallableRequestHandlerTest.php

Indentation +24 added lines, -24 removed lines

@@ -17,28 +17,28 @@
 class CallableRequestHandlerTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $callback = new Fixture\BlankRequestHandler();
-        $requestHandler = new CallableRequestHandler($callback);
-
-        $this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandle() : void
-    {
-        $callback = new Fixture\BlankRequestHandler();
-        $requestHandler = new CallableRequestHandler($callback);
-
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
-
-        $this->assertTrue($callback->isRunned());
-    }
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$callback = new Fixture\BlankRequestHandler();
+		$requestHandler = new CallableRequestHandler($callback);
+
+		$this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandle() : void
+	{
+		$callback = new Fixture\BlankRequestHandler();
+		$requestHandler = new CallableRequestHandler($callback);
+
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
+
+		$this->assertTrue($callback->isRunned());
+	}
 }

tests/RequestHandler/QueueableRequestHandlerTest.php

Indentation +72 added lines, -72 removed lines

@@ -17,76 +17,76 @@
 class QueueableRequestHandlerTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $endpoint = new Fixture\BlankRequestHandler();
-        $requestHandler = new QueueableRequestHandler($endpoint);
-
-        $this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandle() : void
-    {
-        $endpoint = new Fixture\BlankRequestHandler();
-        $requestHandler = new QueueableRequestHandler($endpoint);
-
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
-
-        $this->assertTrue($endpoint->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandleWithMiddlewares() : void
-    {
-        $middlewares = [
-            new Fixture\BlankMiddleware(),
-            new Fixture\BlankMiddleware(),
-            new Fixture\BlankMiddleware(),
-        ];
-
-        $endpoint = new Fixture\BlankRequestHandler();
-        $requestHandler = new QueueableRequestHandler($endpoint);
-        $requestHandler->add(...$middlewares);
-
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
-
-        $this->assertTrue($middlewares[0]->isRunned());
-        $this->assertTrue($middlewares[1]->isRunned());
-        $this->assertTrue($middlewares[2]->isRunned());
-        $this->assertTrue($endpoint->isRunned());
-    }
-
-    /**
-     * @return void
-     */
-    public function testHandleWithBrokenMiddleware() : void
-    {
-        $middlewares = [
-            new Fixture\BlankMiddleware(),
-            new Fixture\BlankMiddleware(true),
-            new Fixture\BlankMiddleware(),
-        ];
-
-        $endpoint = new Fixture\BlankRequestHandler();
-        $requestHandler = new QueueableRequestHandler($endpoint);
-        $requestHandler->add(...$middlewares);
-
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
-
-        $this->assertTrue($middlewares[0]->isRunned());
-        $this->assertTrue($middlewares[1]->isRunned());
-        $this->assertFalse($middlewares[2]->isRunned());
-        $this->assertFalse($endpoint->isRunned());
-    }
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$endpoint = new Fixture\BlankRequestHandler();
+		$requestHandler = new QueueableRequestHandler($endpoint);
+
+		$this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandle() : void
+	{
+		$endpoint = new Fixture\BlankRequestHandler();
+		$requestHandler = new QueueableRequestHandler($endpoint);
+
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
+
+		$this->assertTrue($endpoint->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandleWithMiddlewares() : void
+	{
+		$middlewares = [
+			new Fixture\BlankMiddleware(),
+			new Fixture\BlankMiddleware(),
+			new Fixture\BlankMiddleware(),
+		];
+
+		$endpoint = new Fixture\BlankRequestHandler();
+		$requestHandler = new QueueableRequestHandler($endpoint);
+		$requestHandler->add(...$middlewares);
+
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
+
+		$this->assertTrue($middlewares[0]->isRunned());
+		$this->assertTrue($middlewares[1]->isRunned());
+		$this->assertTrue($middlewares[2]->isRunned());
+		$this->assertTrue($endpoint->isRunned());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHandleWithBrokenMiddleware() : void
+	{
+		$middlewares = [
+			new Fixture\BlankMiddleware(),
+			new Fixture\BlankMiddleware(true),
+			new Fixture\BlankMiddleware(),
+		];
+
+		$endpoint = new Fixture\BlankRequestHandler();
+		$requestHandler = new QueueableRequestHandler($endpoint);
+		$requestHandler->add(...$middlewares);
+
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
+
+		$this->assertTrue($middlewares[0]->isRunned());
+		$this->assertTrue($middlewares[1]->isRunned());
+		$this->assertFalse($middlewares[2]->isRunned());
+		$this->assertFalse($endpoint->isRunned());
+	}
 }

tests/RequestHandler/RoutableRequestHandlerTest.php

Indentation +41 added lines, -41 removed lines

@@ -17,54 +17,54 @@
 class RoutableRequestHandlerTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public function testConstructor() : void
-    {
-        $testRoute = new Fixture\TestRoute();
-        $requestHandler = new RoutableRequestHandler($testRoute);
+	/**
+	 * @return void
+	 */
+	public function testConstructor() : void
+	{
+		$testRoute = new Fixture\TestRoute();
+		$requestHandler = new RoutableRequestHandler($testRoute);
 
-        $this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
-    }
+		$this->assertInstanceOf(RequestHandlerInterface::class, $requestHandler);
+	}
 
-    /**
-     * @return void
-     */
-    public function testHandle() : void
-    {
-        $testRoute = new Fixture\TestRoute();
-        $requestHandler = new RoutableRequestHandler($testRoute);
+	/**
+	 * @return void
+	 */
+	public function testHandle() : void
+	{
+		$testRoute = new Fixture\TestRoute();
+		$requestHandler = new RoutableRequestHandler($testRoute);
 
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
 
-        $this->assertTrue($testRoute->getMiddlewares()[0]->isRunned());
-        $this->assertTrue($testRoute->getMiddlewares()[1]->isRunned());
-        $this->assertTrue($testRoute->getMiddlewares()[2]->isRunned());
-        $this->assertTrue($testRoute->getRequestHandler()->isRunned());
+		$this->assertTrue($testRoute->getMiddlewares()[0]->isRunned());
+		$this->assertTrue($testRoute->getMiddlewares()[1]->isRunned());
+		$this->assertTrue($testRoute->getMiddlewares()[2]->isRunned());
+		$this->assertTrue($testRoute->getRequestHandler()->isRunned());
 
-        $expectedAttributes = [RoutableRequestHandler::ATTR_NAME_FOR_ROUTE_NAME => $testRoute->getName()];
-        $expectedAttributes += $testRoute->getAttributes();
+		$expectedAttributes = [RoutableRequestHandler::ATTR_NAME_FOR_ROUTE_NAME => $testRoute->getName()];
+		$expectedAttributes += $testRoute->getAttributes();
 
-        $this->assertSame($expectedAttributes, $testRoute->getRequestHandler()->getAttributes());
-    }
+		$this->assertSame($expectedAttributes, $testRoute->getRequestHandler()->getAttributes());
+	}
 
-    /**
-     * @return void
-     */
-    public function testHandleWithBrokenMiddleware() : void
-    {
-        $testRoute = new Fixture\TestRoute(Fixture\TestRoute::WITH_BROKEN_MIDDLEWARE);
-        $requestHandler = new RoutableRequestHandler($testRoute);
+	/**
+	 * @return void
+	 */
+	public function testHandleWithBrokenMiddleware() : void
+	{
+		$testRoute = new Fixture\TestRoute(Fixture\TestRoute::WITH_BROKEN_MIDDLEWARE);
+		$requestHandler = new RoutableRequestHandler($testRoute);
 
-        $request = (new ServerRequestFactory)->createServerRequest('GET', '/');
-        $requestHandler->handle($request);
+		$request = (new ServerRequestFactory)->createServerRequest('GET', '/');
+		$requestHandler->handle($request);
 
-        $this->assertTrue($testRoute->getMiddlewares()[0]->isRunned());
-        $this->assertTrue($testRoute->getMiddlewares()[1]->isRunned());
-        $this->assertFalse($testRoute->getMiddlewares()[2]->isRunned());
-        $this->assertFalse($testRoute->getRequestHandler()->isRunned());
-        $this->assertSame([], $testRoute->getRequestHandler()->getAttributes());
-    }
+		$this->assertTrue($testRoute->getMiddlewares()[0]->isRunned());
+		$this->assertTrue($testRoute->getMiddlewares()[1]->isRunned());
+		$this->assertFalse($testRoute->getMiddlewares()[2]->isRunned());
+		$this->assertFalse($testRoute->getRequestHandler()->isRunned());
+		$this->assertSame([], $testRoute->getRequestHandler()->getAttributes());
+	}
 }

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());
+	}
 }