sunrise-php / http-router

functions/path_match.php

Indentation +11 added lines, -11 removed lines

@@ -27,17 +27,17 @@
  */
 function path_match(string $path, string $subject, &$attributes = []) : bool
 {
-    $regex = path_regex($path);
-    if (!preg_match($regex, $subject, $matches)) {
-        return false;
-    }
+	$regex = path_regex($path);
+	if (!preg_match($regex, $subject, $matches)) {
+		return false;
+	}
 
-    $attributes = [];
-    foreach ($matches as $key => $value) {
-        if (!is_int($key) && '' !== $value) {
-            $attributes[$key] = $value;
-        }
-    }
+	$attributes = [];
+	foreach ($matches as $key => $value) {
+		if (!is_int($key) && '' !== $value) {
+			$attributes[$key] = $value;
+		}
+	}
 
-    return true;
+	return true;
 }

functions/path_build.php

Indentation +21 added lines, -21 removed lines

@@ -36,25 +36,25 @@
  */
 function path_build(string $path, array $attributes = [], bool $strict = false) : string
 {
-    $regex = '/{([0-9A-Za-z_]+)(?:<([^<#>]+)>)?}/';
-
-    return preg_replace_callback($regex, function ($match) use ($path, $attributes, $strict) {
-        if (!isset($attributes[$match[1]])) {
-            throw new InvalidArgumentException(
-                sprintf('[%s] missing attribute "%s".', $path, $match[1])
-            );
-        }
-
-        $attributes[$match[1]] = (string) $attributes[$match[1]];
-
-        if ($strict && isset($match[2])) {
-            if (!preg_match('#' . $match[2] . '#u', $attributes[$match[1]])) {
-                throw new InvalidArgumentException(
-                    sprintf('[%s] "%s" must match "%s".', $path, $match[1], $match[2])
-                );
-            }
-        }
-
-        return $attributes[$match[1]];
-    }, $path);
+	$regex = '/{([0-9A-Za-z_]+)(?:<([^<#>]+)>)?}/';
+
+	return preg_replace_callback($regex, function ($match) use ($path, $attributes, $strict) {
+		if (!isset($attributes[$match[1]])) {
+			throw new InvalidArgumentException(
+				sprintf('[%s] missing attribute "%s".', $path, $match[1])
+			);
+		}
+
+		$attributes[$match[1]] = (string) $attributes[$match[1]];
+
+		if ($strict && isset($match[2])) {
+			if (!preg_match('#' . $match[2] . '#u', $attributes[$match[1]])) {
+				throw new InvalidArgumentException(
+					sprintf('[%s] "%s" must match "%s".', $path, $match[1], $match[2])
+				);
+			}
+		}
+
+		return $attributes[$match[1]];
+	}, $path);
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 {
     $regex = '/{([0-9A-Za-z_]+)(?:<([^<#>]+)>)?}/';
 
-    return preg_replace_callback($regex, function ($match) use ($path, $attributes, $strict) {
+    return preg_replace_callback($regex, function($match) use ($path, $attributes, $strict) {
         if (!isset($attributes[$match[1]])) {
             throw new InvalidArgumentException(
                 sprintf('[%s] missing attribute "%s".', $path, $match[1])

functions/path_regex.php

Indentation +12 added lines, -12 removed lines

@@ -34,21 +34,21 @@
  */
 function path_regex(string $path) : string
 {
-    preg_match_all('/{([0-9A-Za-z_]+)(?:<([^<#>]+)>)?}/', $path, $matches, PREG_SET_ORDER);
+	preg_match_all('/{([0-9A-Za-z_]+)(?:<([^<#>]+)>)?}/', $path, $matches, PREG_SET_ORDER);
 
-    foreach ($matches as $match) {
-        $path = str_replace($match[0], '{' . $match[1] . '}', $path);
-    }
+	foreach ($matches as $match) {
+		$path = str_replace($match[0], '{' . $match[1] . '}', $path);
+	}
 
-    $path = addcslashes($path, '#$*+-.?[\]^|');
-    $path = str_replace(['(', ')'], ['(?:', ')?'], $path);
+	$path = addcslashes($path, '#$*+-.?[\]^|');
+	$path = str_replace(['(', ')'], ['(?:', ')?'], $path);
 
-    foreach ($matches as $match) {
-        $pattern = $match[2] ?? '[^/]+';
-        $subpattern = '(?<' . $match[1] . '>' . $pattern . ')';
+	foreach ($matches as $match) {
+		$pattern = $match[2] ?? '[^/]+';
+		$subpattern = '(?<' . $match[1] . '>' . $pattern . ')';
 
-        $path = str_replace('{' . $match[1] . '}', $subpattern, $path);
-    }
+		$path = str_replace('{' . $match[1] . '}', $subpattern, $path);
+	}
 
-    return '#^' . $path . '$#uD';
+	return '#^' . $path . '$#uD';
 }

tests/Annotation/AnnotationRouteLoaderTest.php

Indentation +293 added lines, -293 removed lines

@@ -23,297 +23,297 @@
 class AnnotationRouteLoaderTest extends TestCase
 {
 
-    /**
-     * @return void
-     */
-    public static function setUpBeforeClass() : void
-    {
-        if (!class_exists('Route')) {
-            class_alias(AnnotationRoute::class, 'Route');
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteNameMissing() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.name must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameMissing');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteNameEmpty() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.name must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameEmpty');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteNameNotString() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.name must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameNotString');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRoutePathMissing() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.path must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathMissing');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRoutePathEmpty() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.path must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathEmpty');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRoutePathNotString() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.path must be not an empty string.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathNotString');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMethodsMissing() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.methods must be not an empty array.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsMissing');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMethodsEmpty() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.methods must be not an empty array.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsEmpty');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMethodsNotArray() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.methods must be not an empty array.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsNotArray');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMethodsNotStringable() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.methods must contain only strings.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsNotStringable');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMiddlewaresNotArray() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.middlewares must be an array.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresNotArray');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMiddlewaresNotStringable() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresNotStringable');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMiddlewaresContainNonexistenceClass() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresContainNonexistenceClass');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteMiddlewaresContainNotMiddleware() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresContainNotMiddleware');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRouteAttributesNotArray() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.attributes must be an array.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRouteAttributesNotArray');
-    }
-
-    /**
-     * @return void
-     */
-    public function testAnnotationRoutePriorityNotInteger() : void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('@Route.priority must be an integer.');
-
-        $root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
-        (new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePriorityNotInteger');
-    }
-
-    /**
-     * @return void
-     *
-     * @todo This test needs to be improved...
-     */
-    public function testBuildRoutes() : void
-    {
-        $loader = new AnnotationRouteLoader();
-        $loader->discover(__DIR__ . '/../Fixture/Annotation/AnnotationRouteValid');
-
-        $routesMap = [];
-        $builtRoutes = $loader->buildRoutes();
-
-        foreach ($builtRoutes as $i => $route) {
-            $routesMap[$i]['name'] = $route->getName();
-            $routesMap[$i]['path'] = $route->getPath();
-            $routesMap[$i]['methods'] = $route->getMethods();
-            $routesMap[$i]['requestHandler'] = get_class($route->getRequestHandler());
-            $routesMap[$i]['middlewares'] = [];
-            $routesMap[$i]['attributes'] = $route->getAttributes();
-
-            foreach ($route->getMiddlewares() as $middleware) {
-                $routesMap[$i]['middlewares'][] = get_class($middleware);
-            }
-        }
-
-        $expectedMap = [
-            [
-                'name' => 'quuuux',
-                'path' => '/quuuux',
-                'methods' => ['PATCH', 'DELETE'],
-                'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
-                                    '\AnnotationRouteValid\Subdirectory\QuuuuxRequestHandler',
-                'middlewares' => [
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                ],
-                'attributes' => [
-                    'foo' => 'bar',
-                    'source' => 'quuuux',
-                ],
-            ],
-            [
-                'name' => 'quuux',
-                'path' => '/quuux',
-                'methods' => ['PUT', 'PATCH'],
-                'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
-                                    '\AnnotationRouteValid\Subdirectory\QuuuxRequestHandler',
-                'middlewares' => [
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                ],
-                'attributes' => [
-                    'foo' => 'bar',
-                    'source' => 'quuux',
-                ],
-            ],
-            [
-                'name' => 'quux',
-                'path' => '/quux',
-                'methods' => ['POST', 'PUT'],
-                'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
-                                    '\AnnotationRouteValid\QuuxRequestHandler',
-                'middlewares' => [
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                ],
-                'attributes' => [
-                    'foo' => 'bar',
-                    'source' => 'quux',
-                ],
-            ],
-            [
-                'name' => 'qux',
-                'path' => '/qux',
-                'methods' => ['GET', 'POST'],
-                'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
-                                    '\AnnotationRouteValid\QuxRequestHandler',
-                'middlewares' => [
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                    'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
-                ],
-                'attributes' => [
-                    'foo' => 'bar',
-                    'source' => 'qux',
-                ],
-            ],
-        ];
-
-        $this->assertSame($expectedMap, $routesMap);
-    }
+	/**
+	 * @return void
+	 */
+	public static function setUpBeforeClass() : void
+	{
+		if (!class_exists('Route')) {
+			class_alias(AnnotationRoute::class, 'Route');
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteNameMissing() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.name must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameMissing');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteNameEmpty() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.name must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameEmpty');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteNameNotString() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.name must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteNameNotString');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRoutePathMissing() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.path must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathMissing');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRoutePathEmpty() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.path must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathEmpty');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRoutePathNotString() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.path must be not an empty string.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePathNotString');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMethodsMissing() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.methods must be not an empty array.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsMissing');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMethodsEmpty() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.methods must be not an empty array.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsEmpty');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMethodsNotArray() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.methods must be not an empty array.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsNotArray');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMethodsNotStringable() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.methods must contain only strings.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMethodsNotStringable');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMiddlewaresNotArray() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.middlewares must be an array.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresNotArray');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMiddlewaresNotStringable() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresNotStringable');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMiddlewaresContainNonexistenceClass() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresContainNonexistenceClass');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteMiddlewaresContainNotMiddleware() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.middlewares must contain only middlewares.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteMiddlewaresContainNotMiddleware');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRouteAttributesNotArray() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.attributes must be an array.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRouteAttributesNotArray');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAnnotationRoutePriorityNotInteger() : void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('@Route.priority must be an integer.');
+
+		$root = __DIR__ . '/../Fixture/Annotation/AnnotationRouteInvalid';
+		(new AnnotationRouteLoader)->discover($root . '/AnnotationRoutePriorityNotInteger');
+	}
+
+	/**
+	 * @return void
+	 *
+	 * @todo This test needs to be improved...
+	 */
+	public function testBuildRoutes() : void
+	{
+		$loader = new AnnotationRouteLoader();
+		$loader->discover(__DIR__ . '/../Fixture/Annotation/AnnotationRouteValid');
+
+		$routesMap = [];
+		$builtRoutes = $loader->buildRoutes();
+
+		foreach ($builtRoutes as $i => $route) {
+			$routesMap[$i]['name'] = $route->getName();
+			$routesMap[$i]['path'] = $route->getPath();
+			$routesMap[$i]['methods'] = $route->getMethods();
+			$routesMap[$i]['requestHandler'] = get_class($route->getRequestHandler());
+			$routesMap[$i]['middlewares'] = [];
+			$routesMap[$i]['attributes'] = $route->getAttributes();
+
+			foreach ($route->getMiddlewares() as $middleware) {
+				$routesMap[$i]['middlewares'][] = get_class($middleware);
+			}
+		}
+
+		$expectedMap = [
+			[
+				'name' => 'quuuux',
+				'path' => '/quuuux',
+				'methods' => ['PATCH', 'DELETE'],
+				'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
+									'\AnnotationRouteValid\Subdirectory\QuuuuxRequestHandler',
+				'middlewares' => [
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+				],
+				'attributes' => [
+					'foo' => 'bar',
+					'source' => 'quuuux',
+				],
+			],
+			[
+				'name' => 'quuux',
+				'path' => '/quuux',
+				'methods' => ['PUT', 'PATCH'],
+				'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
+									'\AnnotationRouteValid\Subdirectory\QuuuxRequestHandler',
+				'middlewares' => [
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+				],
+				'attributes' => [
+					'foo' => 'bar',
+					'source' => 'quuux',
+				],
+			],
+			[
+				'name' => 'quux',
+				'path' => '/quux',
+				'methods' => ['POST', 'PUT'],
+				'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
+									'\AnnotationRouteValid\QuuxRequestHandler',
+				'middlewares' => [
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+				],
+				'attributes' => [
+					'foo' => 'bar',
+					'source' => 'quux',
+				],
+			],
+			[
+				'name' => 'qux',
+				'path' => '/qux',
+				'methods' => ['GET', 'POST'],
+				'requestHandler' => 'Sunrise\Http\Router\Tests\Fixture\Annotation' .
+									'\AnnotationRouteValid\QuxRequestHandler',
+				'middlewares' => [
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+					'Sunrise\Http\Router\Tests\Fixture\BlankMiddleware',
+				],
+				'attributes' => [
+					'foo' => 'bar',
+					'source' => 'qux',
+				],
+			],
+		];
+
+		$this->assertSame($expectedMap, $routesMap);
+	}
 }

src/Router.php

Indentation +90 added lines, -90 removed lines

@@ -34,94 +34,94 @@
 class Router extends RouteCollection implements MiddlewareInterface, RequestHandlerInterface
 {
 
-    /**
-     * Server Request attribute name for routing error instance
-     *
-     * @var string
-     */
-    public const ATTR_NAME_FOR_ROUTING_ERROR = '@routing-error';
-
-    /**
-     * Gets a route for the given name
-     *
-     * @param string $name
-     *
-     * @return RouteInterface
-     *
-     * @throws RouteNotFoundException
-     */
-    public function getRoute(string $name) : RouteInterface
-    {
-        foreach ($this->getRoutes() as $route) {
-            if ($name === $route->getName()) {
-                return $route;
-            }
-        }
-
-        throw new RouteNotFoundException();
-    }
-
-    /**
-     * Looks for a route that matches the given request
-     *
-     * @param ServerRequestInterface $request
-     *
-     * @return RouteInterface
-     *
-     * @throws MethodNotAllowedException
-     * @throws RouteNotFoundException
-     *
-     * @todo Matching by strategy for detecting verbs...
-     */
-    public function match(ServerRequestInterface $request) : RouteInterface
-    {
-        $routes = [];
-        foreach ($this->getRoutes() as $route) {
-            foreach ($route->getMethods() as $method) {
-                $routes[$method][] = $route;
-            }
-        }
-
-        $method = $request->getMethod();
-        if (!isset($routes[$method])) {
-            throw new MethodNotAllowedException(
-                array_keys($routes)
-            );
-        }
-
-        $target = $request->getUri()->getPath();
-        foreach ($routes[$method] as $route) {
-            if (path_match($route->getPath(), $target, $attributes)) {
-                return $route->withAddedAttributes($attributes);
-            }
-        }
-
-        throw new RouteNotFoundException();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $route = $this->match($request);
-
-        $requestHandler = new RoutableRequestHandler($route);
-
-        return $requestHandler->handle($request);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        try {
-            return $this->handle($request);
-        } catch (ExceptionInterface $e) {
-            return $handler->handle(
-                $request->withAttribute(self::ATTR_NAME_FOR_ROUTING_ERROR, $e)
-            );
-        }
-    }
+	/**
+	 * Server Request attribute name for routing error instance
+	 *
+	 * @var string
+	 */
+	public const ATTR_NAME_FOR_ROUTING_ERROR = '@routing-error';
+
+	/**
+	 * Gets a route for the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return RouteInterface
+	 *
+	 * @throws RouteNotFoundException
+	 */
+	public function getRoute(string $name) : RouteInterface
+	{
+		foreach ($this->getRoutes() as $route) {
+			if ($name === $route->getName()) {
+				return $route;
+			}
+		}
+
+		throw new RouteNotFoundException();
+	}
+
+	/**
+	 * Looks for a route that matches the given request
+	 *
+	 * @param ServerRequestInterface $request
+	 *
+	 * @return RouteInterface
+	 *
+	 * @throws MethodNotAllowedException
+	 * @throws RouteNotFoundException
+	 *
+	 * @todo Matching by strategy for detecting verbs...
+	 */
+	public function match(ServerRequestInterface $request) : RouteInterface
+	{
+		$routes = [];
+		foreach ($this->getRoutes() as $route) {
+			foreach ($route->getMethods() as $method) {
+				$routes[$method][] = $route;
+			}
+		}
+
+		$method = $request->getMethod();
+		if (!isset($routes[$method])) {
+			throw new MethodNotAllowedException(
+				array_keys($routes)
+			);
+		}
+
+		$target = $request->getUri()->getPath();
+		foreach ($routes[$method] as $route) {
+			if (path_match($route->getPath(), $target, $attributes)) {
+				return $route->withAddedAttributes($attributes);
+			}
+		}
+
+		throw new RouteNotFoundException();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function handle(ServerRequestInterface $request) : ResponseInterface
+	{
+		$route = $this->match($request);
+
+		$requestHandler = new RoutableRequestHandler($route);
+
+		return $requestHandler->handle($request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+	{
+		try {
+			return $this->handle($request);
+		} catch (ExceptionInterface $e) {
+			return $handler->handle(
+				$request->withAttribute(self::ATTR_NAME_FOR_ROUTING_ERROR, $e)
+			);
+		}
+	}
 }

src/RequestHandler/QueueableRequestHandler.php

Indentation +46 added lines, -46 removed lines

@@ -26,56 +26,56 @@
 class QueueableRequestHandler implements RequestHandlerInterface
 {
 
-    /**
-     * The request handler queue
-     *
-     * @var SplQueue
-     */
-    private $queue;
+	/**
+	 * The request handler queue
+	 *
+	 * @var SplQueue
+	 */
+	private $queue;
 
-    /**
-     * The request handler endpoint
-     *
-     * @var RequestHandlerInterface
-     */
-    private $endpoint;
+	/**
+	 * The request handler endpoint
+	 *
+	 * @var RequestHandlerInterface
+	 */
+	private $endpoint;
 
-    /**
-     * Constructor of the class
-     *
-     * @param RequestHandlerInterface $endpoint
-     */
-    public function __construct(RequestHandlerInterface $endpoint)
-    {
-        $this->queue = new SplQueue();
-        $this->endpoint = $endpoint;
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param RequestHandlerInterface $endpoint
+	 */
+	public function __construct(RequestHandlerInterface $endpoint)
+	{
+		$this->queue = new SplQueue();
+		$this->endpoint = $endpoint;
+	}
 
-    /**
-     * Adds the given middleware(s) to the request handler queue
-     *
-     * @param MiddlewareInterface ...$middlewares
-     *
-     * @return RequestHandlerInterface
-     */
-    public function add(MiddlewareInterface ...$middlewares) : RequestHandlerInterface
-    {
-        foreach ($middlewares as $middleware) {
-            $this->queue->enqueue($middleware);
-        }
+	/**
+	 * Adds the given middleware(s) to the request handler queue
+	 *
+	 * @param MiddlewareInterface ...$middlewares
+	 *
+	 * @return RequestHandlerInterface
+	 */
+	public function add(MiddlewareInterface ...$middlewares) : RequestHandlerInterface
+	{
+		foreach ($middlewares as $middleware) {
+			$this->queue->enqueue($middleware);
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        if (!$this->queue->isEmpty()) {
-            return $this->queue->dequeue()->process($request, $this);
-        }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function handle(ServerRequestInterface $request) : ResponseInterface
+	{
+		if (!$this->queue->isEmpty()) {
+			return $this->queue->dequeue()->process($request, $this);
+		}
 
-        return $this->endpoint->handle($request);
-    }
+		return $this->endpoint->handle($request);
+	}
 }