sunrise-php / http-router

src/Router.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 				{
 					$attributes = \array_filter($matches, function($value, $name)
 					{
-						return ! ('' === $value || \is_int($name));
+						return !('' === $value || \is_int($name));
 
 					}, \ARRAY_FILTER_USE_BOTH);
 
@@ -94,7 +94,7 @@ 
 			}
 		}
 
-		if (! empty($allowed))
+		if (!empty($allowed))
 		{
 			throw new MethodNotAllowedException($request, $allowed);
 		}

Indentation +127 added lines, -127 removed lines

@@ -26,131 +26,131 @@
 class Router implements RouterInterface
 {
 
-	/**
-	 * The router map
-	 *
-	 * @var RouteInterface[]
-	 */
-	protected $routes = [];
-
-	/**
-	 * The router middleware stack
-	 *
-	 * @var MiddlewareInterface[]
-	 */
-	protected $middlewareStack = [];
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addRoute(RouteInterface $route) : RouterInterface
-	{
-		$this->routes[] = $route;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addRoutes(RouteCollectionInterface $collection) : RouterInterface
-	{
-		foreach ($collection->getRoutes() as $route)
-		{
-			$this->addRoute($route);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addMiddleware(MiddlewareInterface $middleware) : RouterInterface
-	{
-		$this->middlewareStack[] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getRoutes() : array
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMiddlewareStack() : array
-	{
-		return $this->middlewareStack;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function match(ServerRequestInterface $request) : RouteInterface
-	{
-		$allowed = [];
-
-		foreach ($this->getRoutes() as $route)
-		{
-			$regex = $route->buildRegex();
-
-			if (\preg_match($regex, $request->getUri()->getPath(), $matches))
-			{
-				$allowed = \array_merge($allowed, $route->getMethods());
-
-				if (\in_array($request->getMethod(), $route->getMethods()))
-				{
-					$attributes = \array_filter($matches, function($value, $name)
-					{
-						return ! ('' === $value || \is_int($name));
-
-					}, \ARRAY_FILTER_USE_BOTH);
-
-					return $route->withAttributes($attributes);
-				}
-			}
-		}
-
-		if (! empty($allowed))
-		{
-			throw new MethodNotAllowedException($request, $allowed);
-		}
-
-		throw new RouteNotFoundException($request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function handle(ServerRequestInterface $request) : ResponseInterface
-	{
-		$route = $this->match($request);
-
-		$requestHandler = new RequestHandler();
-
-		foreach ($this->getMiddlewareStack() as $middleware)
-		{
-			$requestHandler->add($middleware);
-		}
-
-		foreach ($route->getMiddlewareStack() as $middleware)
-		{
-			$requestHandler->add($middleware);
-		}
-
-		foreach ($route->getAttributes() as $name => $value)
-		{
-			$request = $request->withAttribute($name, $value);
-		}
-
-		$request = $request->withAttribute('@route', $route->getId());
-
-		return $requestHandler->handle($request);
-	}
+    /**
+     * The router map
+     *
+     * @var RouteInterface[]
+     */
+    protected $routes = [];
+
+    /**
+     * The router middleware stack
+     *
+     * @var MiddlewareInterface[]
+     */
+    protected $middlewareStack = [];
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addRoute(RouteInterface $route) : RouterInterface
+    {
+        $this->routes[] = $route;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addRoutes(RouteCollectionInterface $collection) : RouterInterface
+    {
+        foreach ($collection->getRoutes() as $route)
+        {
+            $this->addRoute($route);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addMiddleware(MiddlewareInterface $middleware) : RouterInterface
+    {
+        $this->middlewareStack[] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoutes() : array
+    {
+        return $this->routes;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMiddlewareStack() : array
+    {
+        return $this->middlewareStack;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function match(ServerRequestInterface $request) : RouteInterface
+    {
+        $allowed = [];
+
+        foreach ($this->getRoutes() as $route)
+        {
+            $regex = $route->buildRegex();
+
+            if (\preg_match($regex, $request->getUri()->getPath(), $matches))
+            {
+                $allowed = \array_merge($allowed, $route->getMethods());
+
+                if (\in_array($request->getMethod(), $route->getMethods()))
+                {
+                    $attributes = \array_filter($matches, function($value, $name)
+                    {
+                        return ! ('' === $value || \is_int($name));
+
+                    }, \ARRAY_FILTER_USE_BOTH);
+
+                    return $route->withAttributes($attributes);
+                }
+            }
+        }
+
+        if (! empty($allowed))
+        {
+            throw new MethodNotAllowedException($request, $allowed);
+        }
+
+        throw new RouteNotFoundException($request);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function handle(ServerRequestInterface $request) : ResponseInterface
+    {
+        $route = $this->match($request);
+
+        $requestHandler = new RequestHandler();
+
+        foreach ($this->getMiddlewareStack() as $middleware)
+        {
+            $requestHandler->add($middleware);
+        }
+
+        foreach ($route->getMiddlewareStack() as $middleware)
+        {
+            $requestHandler->add($middleware);
+        }
+
+        foreach ($route->getAttributes() as $name => $value)
+        {
+            $request = $request->withAttribute($name, $value);
+        }
+
+        $request = $request->withAttribute('@route', $route->getId());
+
+        return $requestHandler->handle($request);
+    }
 }

src/Route.php

Indentation +198 added lines, -198 removed lines

@@ -22,202 +22,202 @@
 class Route implements RouteInterface
 {
 
-	/**
-	 * The route ID
-	 *
-	 * @var string
-	 */
-	protected $id;
-
-	/**
-	 * The route path
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * The route methods
-	 *
-	 * @var string[]
-	 */
-	protected $methods = [];
-
-	/**
-	 * The route patterns
-	 *
-	 * @var array
-	 */
-	protected $patterns = [];
-
-	/**
-	 * The route attributes
-	 *
-	 * @var array
-	 */
-	protected $attributes = [];
-
-	/**
-	 * The route middleware stack
-	 *
-	 * @var MiddlewareInterface[]
-	 */
-	protected $middlewareStack = [];
-
-	/**
-	 * Constructor of the class
-	 *
-	 * @param string $id
-	 * @param string $path
-	 * @param string[] $methods
-	 */
-	public function __construct(string $id, string $path, array $methods)
-	{
-		$this->setId($id);
-
-		$this->setPath($path);
-
-		foreach ($methods as $method)
-		{
-			$this->addMethod($method);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setId(string $id) : RouteInterface
-	{
-		$this->id = $id;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setPath(string $path) : RouteInterface
-	{
-		$this->path = $path;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addPrefix(string $prefix) : RouteInterface
-	{
-		$this->path = $prefix . $this->path;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addSuffix(string $suffix) : RouteInterface
-	{
-		$this->path .= $suffix;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addMethod(string $method) : RouteInterface
-	{
-		$this->methods[] = \strtoupper($method);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addPattern(string $name, string $value) : RouteInterface
-	{
-		$this->patterns[$name] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addMiddleware(MiddlewareInterface $middleware) : RouteInterface
-	{
-		$this->middlewareStack[] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getId() : string
-	{
-		return $this->id;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getPath() : string
-	{
-		return $this->path;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMethods() : array
-	{
-		return $this->methods;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getPatterns() : array
-	{
-		return $this->patterns;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAttributes() : array
-	{
-		return $this->attributes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMiddlewareStack() : array
-	{
-		return $this->middlewareStack;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withAttributes(array $attributes) : RouteInterface
-	{
-		$clone = clone $this;
-
-		$clone->attributes = \array_merge($clone->attributes, $attributes);
-
-		return $clone;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function buildRegex() : string
-	{
-		return route_regex($this->path, $this->patterns);
-	}
+    /**
+     * The route ID
+     *
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * The route path
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * The route methods
+     *
+     * @var string[]
+     */
+    protected $methods = [];
+
+    /**
+     * The route patterns
+     *
+     * @var array
+     */
+    protected $patterns = [];
+
+    /**
+     * The route attributes
+     *
+     * @var array
+     */
+    protected $attributes = [];
+
+    /**
+     * The route middleware stack
+     *
+     * @var MiddlewareInterface[]
+     */
+    protected $middlewareStack = [];
+
+    /**
+     * Constructor of the class
+     *
+     * @param string $id
+     * @param string $path
+     * @param string[] $methods
+     */
+    public function __construct(string $id, string $path, array $methods)
+    {
+        $this->setId($id);
+
+        $this->setPath($path);
+
+        foreach ($methods as $method)
+        {
+            $this->addMethod($method);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setId(string $id) : RouteInterface
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPath(string $path) : RouteInterface
+    {
+        $this->path = $path;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addPrefix(string $prefix) : RouteInterface
+    {
+        $this->path = $prefix . $this->path;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addSuffix(string $suffix) : RouteInterface
+    {
+        $this->path .= $suffix;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addMethod(string $method) : RouteInterface
+    {
+        $this->methods[] = \strtoupper($method);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addPattern(string $name, string $value) : RouteInterface
+    {
+        $this->patterns[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addMiddleware(MiddlewareInterface $middleware) : RouteInterface
+    {
+        $this->middlewareStack[] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId() : string
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPath() : string
+    {
+        return $this->path;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMethods() : array
+    {
+        return $this->methods;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPatterns() : array
+    {
+        return $this->patterns;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAttributes() : array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMiddlewareStack() : array
+    {
+        return $this->middlewareStack;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withAttributes(array $attributes) : RouteInterface
+    {
+        $clone = clone $this;
+
+        $clone->attributes = \array_merge($clone->attributes, $attributes);
+
+        return $clone;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function buildRegex() : string
+    {
+        return route_regex($this->path, $this->patterns);
+    }
 }

src/RouterInterface.php

Indentation +50 added lines, -50 removed lines

@@ -24,59 +24,59 @@
 interface RouterInterface extends RequestHandlerInterface
 {
 
-	/**
-	 * Adds the given route to the router map
-	 *
-	 * @param RouteInterface $route
-	 *
-	 * @return RouterInterface
-	 */
-	public function addRoute(RouteInterface $route) : RouterInterface;
+    /**
+     * Adds the given route to the router map
+     *
+     * @param RouteInterface $route
+     *
+     * @return RouterInterface
+     */
+    public function addRoute(RouteInterface $route) : RouterInterface;
 
-	/**
-	 * Adds the given routes to the router map
-	 *
-	 * @param RouteCollectionInterface $collection
-	 *
-	 * @return RouterInterface
-	 */
-	public function addRoutes(RouteCollectionInterface $collection) : RouterInterface;
+    /**
+     * Adds the given routes to the router map
+     *
+     * @param RouteCollectionInterface $collection
+     *
+     * @return RouterInterface
+     */
+    public function addRoutes(RouteCollectionInterface $collection) : RouterInterface;
 
-	/**
-	 * Adds the given middleware to the router middleware stack
-	 *
-	 * @param MiddlewareInterface $middleware
-	 *
-	 * @return RouterInterface
-	 */
-	public function addMiddleware(MiddlewareInterface $middleware) : RouterInterface;
+    /**
+     * Adds the given middleware to the router middleware stack
+     *
+     * @param MiddlewareInterface $middleware
+     *
+     * @return RouterInterface
+     */
+    public function addMiddleware(MiddlewareInterface $middleware) : RouterInterface;
 
-	/**
-	 * Gets the router map
-	 *
-	 * @return RouteInterface[]
-	 */
-	public function getRoutes() : array;
+    /**
+     * Gets the router map
+     *
+     * @return RouteInterface[]
+     */
+    public function getRoutes() : array;
 
-	/**
-	 * Gets the router middleware stack
-	 *
-	 * @return MiddlewareInterface[]
-	 */
-	public function getMiddlewareStack() : array;
+    /**
+     * Gets the router middleware stack
+     *
+     * @return MiddlewareInterface[]
+     */
+    public function getMiddlewareStack() : array;
 
-	/**
-	 * Looks for a route that matches the given request
-	 *
-	 * @param ServerRequestInterface $request
-	 *
-	 * @return RouteInterface
-	 *
-	 * @throws Exception\MethodNotAllowedException
-	 *         If the route found does not support the requested HTTP method.
-	 *
-	 * @throws Exception\RouteNotFoundException
-	 *         If a route was not matched.
-	 */
-	public function match(ServerRequestInterface $request) : RouteInterface;
+    /**
+     * Looks for a route that matches the given request
+     *
+     * @param ServerRequestInterface $request
+     *
+     * @return RouteInterface
+     *
+     * @throws Exception\MethodNotAllowedException
+     *         If the route found does not support the requested HTTP method.
+     *
+     * @throws Exception\RouteNotFoundException
+     *         If a route was not matched.
+     */
+    public function match(ServerRequestInterface $request) : RouteInterface;
 }

src/RouteCollectionInterface.php

Indentation +126 added lines, -126 removed lines

@@ -17,130 +17,130 @@
 interface RouteCollectionInterface
 {
 
-	/**
-	 * Adds the given route to the collection
-	 *
-	 * @param RouteInterface $route
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function addRoute(RouteInterface $route) : RouteCollectionInterface;
-
-	/**
-	 * Gets the collection routes
-	 *
-	 * @return RouteInterface[]
-	 */
-	public function getRoutes() : array;
-
-	/**
-	 * Adds a new route to the collection
-	 *
-	 * @param string $id
-	 * @param string $path
-	 * @param string[] $methods
-	 *
-	 * @return RouteInterface
-	 */
-	public function route(string $id, string $path, array $methods) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to HEAD requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function head(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to GET requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function get(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to POST requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function post(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to PUT requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function put(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to PATCH requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function patch(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to DELETE requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function delete(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to PURGE requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function purge(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to safe requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function safe(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Adds a new route to the collection that will respond to any requests
-	 *
-	 * @param string $id
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function any(string $id, string $path) : RouteInterface;
-
-	/**
-	 * Route grouping
-	 *
-	 * @param string $prefix
-	 * @param callable $callback
-	 *
-	 * @return void
-	 */
-	public function group(string $prefix, callable $callback) : void;
+    /**
+     * Adds the given route to the collection
+     *
+     * @param RouteInterface $route
+     *
+     * @return RouteCollectionInterface
+     */
+    public function addRoute(RouteInterface $route) : RouteCollectionInterface;
+
+    /**
+     * Gets the collection routes
+     *
+     * @return RouteInterface[]
+     */
+    public function getRoutes() : array;
+
+    /**
+     * Adds a new route to the collection
+     *
+     * @param string $id
+     * @param string $path
+     * @param string[] $methods
+     *
+     * @return RouteInterface
+     */
+    public function route(string $id, string $path, array $methods) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to HEAD requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function head(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to GET requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function get(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to POST requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function post(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to PUT requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function put(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to PATCH requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function patch(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to DELETE requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function delete(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to PURGE requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function purge(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to safe requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function safe(string $id, string $path) : RouteInterface;
+
+    /**
+     * Adds a new route to the collection that will respond to any requests
+     *
+     * @param string $id
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function any(string $id, string $path) : RouteInterface;
+
+    /**
+     * Route grouping
+     *
+     * @param string $prefix
+     * @param callable $callback
+     *
+     * @return void
+     */
+    public function group(string $prefix, callable $callback) : void;
 }

src/RouteInterface.php

Indentation +125 added lines, -125 removed lines

@@ -22,129 +22,129 @@
 interface RouteInterface
 {
 
-	/**
-	 * Sets the given ID to the route
-	 *
-	 * @param string $id
-	 *
-	 * @return RouteInterface
-	 */
-	public function setId(string $id) : RouteInterface;
-
-	/**
-	 * Sets the given path to the route
-	 *
-	 * @param string $path
-	 *
-	 * @return RouteInterface
-	 */
-	public function setPath(string $path) : RouteInterface;
-
-	/**
-	 * Adds the given prefix to the route path
-	 *
-	 * @param string $prefix
-	 *
-	 * @return RouteInterface
-	 */
-	public function addPrefix(string $prefix) : RouteInterface;
-
-	/**
-	 * Adds the given suffix to the route path
-	 *
-	 * @param string $suffix
-	 *
-	 * @return RouteInterface
-	 */
-	public function addSuffix(string $suffix) : RouteInterface;
-
-	/**
-	 * Adds the given method to the route
-	 *
-	 * @param string $method
-	 *
-	 * @return RouteInterface
-	 */
-	public function addMethod(string $method) : RouteInterface;
-
-	/**
-	 * Adds the given pattern to the route
-	 *
-	 * @param string $name
-	 * @param string $value
-	 *
-	 * @return RouteInterface
-	 */
-	public function addPattern(string $name, string $value) : RouteInterface;
-
-	/**
-	 * Adds the given middleware to the route middleware stack
-	 *
-	 * @param MiddlewareInterface $middleware
-	 *
-	 * @return RouteInterface
-	 */
-	public function addMiddleware(MiddlewareInterface $middleware) : RouteInterface;
-
-	/**
-	 * Gets the route ID
-	 *
-	 * @return string
-	 *
-	 * @throws \RuntimeException If the route ID is missing
-	 */
-	public function getId() : string;
-
-	/**
-	 * Gets the route path
-	 *
-	 * @return string
-	 *
-	 * @throws \RuntimeException If the route path is missing
-	 */
-	public function getPath() : string;
-
-	/**
-	 * Gets the route methods
-	 *
-	 * @return string[]
-	 */
-	public function getMethods() : array;
-
-	/**
-	 * Gets the route patterns
-	 *
-	 * @return array
-	 */
-	public function getPatterns() : array;
-
-	/**
-	 * Gets the route attributes
-	 *
-	 * @return array
-	 */
-	public function getAttributes() : array;
-
-	/**
-	 * Gets the route middleware stack
-	 *
-	 * @return MiddlewareInterface[]
-	 */
-	public function getMiddlewareStack() : array;
-
-	/**
-	 * Returns the route clone with the given attributes
-	 *
-	 * @param array $attributes
-	 *
-	 * @return RouteInterface
-	 */
-	public function withAttributes(array $attributes) : RouteInterface;
-
-	/**
-	 * Builds the route regular expression
-	 *
-	 * @return string
-	 */
-	public function buildRegex() : string;
+    /**
+     * Sets the given ID to the route
+     *
+     * @param string $id
+     *
+     * @return RouteInterface
+     */
+    public function setId(string $id) : RouteInterface;
+
+    /**
+     * Sets the given path to the route
+     *
+     * @param string $path
+     *
+     * @return RouteInterface
+     */
+    public function setPath(string $path) : RouteInterface;
+
+    /**
+     * Adds the given prefix to the route path
+     *
+     * @param string $prefix
+     *
+     * @return RouteInterface
+     */
+    public function addPrefix(string $prefix) : RouteInterface;
+
+    /**
+     * Adds the given suffix to the route path
+     *
+     * @param string $suffix
+     *
+     * @return RouteInterface
+     */
+    public function addSuffix(string $suffix) : RouteInterface;
+
+    /**
+     * Adds the given method to the route
+     *
+     * @param string $method
+     *
+     * @return RouteInterface
+     */
+    public function addMethod(string $method) : RouteInterface;
+
+    /**
+     * Adds the given pattern to the route
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return RouteInterface
+     */
+    public function addPattern(string $name, string $value) : RouteInterface;
+
+    /**
+     * Adds the given middleware to the route middleware stack
+     *
+     * @param MiddlewareInterface $middleware
+     *
+     * @return RouteInterface
+     */
+    public function addMiddleware(MiddlewareInterface $middleware) : RouteInterface;
+
+    /**
+     * Gets the route ID
+     *
+     * @return string
+     *
+     * @throws \RuntimeException If the route ID is missing
+     */
+    public function getId() : string;
+
+    /**
+     * Gets the route path
+     *
+     * @return string
+     *
+     * @throws \RuntimeException If the route path is missing
+     */
+    public function getPath() : string;
+
+    /**
+     * Gets the route methods
+     *
+     * @return string[]
+     */
+    public function getMethods() : array;
+
+    /**
+     * Gets the route patterns
+     *
+     * @return array
+     */
+    public function getPatterns() : array;
+
+    /**
+     * Gets the route attributes
+     *
+     * @return array
+     */
+    public function getAttributes() : array;
+
+    /**
+     * Gets the route middleware stack
+     *
+     * @return MiddlewareInterface[]
+     */
+    public function getMiddlewareStack() : array;
+
+    /**
+     * Returns the route clone with the given attributes
+     *
+     * @param array $attributes
+     *
+     * @return RouteInterface
+     */
+    public function withAttributes(array $attributes) : RouteInterface;
+
+    /**
+     * Builds the route regular expression
+     *
+     * @return string
+     */
+    public function buildRegex() : string;
 }

src/RouteCollection.php

Indentation +157 added lines, -157 removed lines

@@ -22,161 +22,161 @@
 class RouteCollection implements RouteCollectionInterface
 {
 
-	/**
-	 * The collection routes
-	 *
-	 * @var RouteInterface[]
-	 */
-	protected $routes = [];
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function addRoute(RouteInterface $route) : RouteCollectionInterface
-	{
-		$this->routes[] = $route;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getRoutes() : array
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function route(string $id, string $path, array $methods) : RouteInterface
-	{
-		$route = new Route($id, $path, $methods);
-
-		$this->addRoute($route);
-
-		return $route;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function head(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_HEAD];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function get(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_GET];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function post(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_POST];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function put(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_PUT];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function patch(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_PATCH];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function delete(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_DELETE];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function purge(string $id, string $path) : RouteInterface
-	{
-		$methods = [RequestMethodInterface::METHOD_PURGE];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function safe(string $id, string $path) : RouteInterface
-	{
-		$methods = [
-			RequestMethodInterface::METHOD_HEAD,
-			RequestMethodInterface::METHOD_GET,
-		];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function any(string $id, string $path) : RouteInterface
-	{
-		$methods = [
-			RequestMethodInterface::METHOD_HEAD,
-			RequestMethodInterface::METHOD_GET,
-			RequestMethodInterface::METHOD_POST,
-			RequestMethodInterface::METHOD_PUT,
-			RequestMethodInterface::METHOD_PATCH,
-			RequestMethodInterface::METHOD_DELETE,
-			RequestMethodInterface::METHOD_PURGE,
-			RequestMethodInterface::METHOD_OPTIONS,
-			RequestMethodInterface::METHOD_TRACE,
-			RequestMethodInterface::METHOD_CONNECT,
-		];
-
-		return $this->route($id, $path, $methods);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function group(string $prefix, callable $callback) : void
-	{
-		$collection = new self;
-
-		$callback($collection);
-
-		foreach ($collection->getRoutes() as $route)
-		{
-			$route->addPrefix($prefix);
-
-			$this->addRoute($route);
-		}
-	}
+    /**
+     * The collection routes
+     *
+     * @var RouteInterface[]
+     */
+    protected $routes = [];
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addRoute(RouteInterface $route) : RouteCollectionInterface
+    {
+        $this->routes[] = $route;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoutes() : array
+    {
+        return $this->routes;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function route(string $id, string $path, array $methods) : RouteInterface
+    {
+        $route = new Route($id, $path, $methods);
+
+        $this->addRoute($route);
+
+        return $route;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function head(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_HEAD];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_GET];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function post(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_POST];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function put(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_PUT];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function patch(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_PATCH];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_DELETE];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function purge(string $id, string $path) : RouteInterface
+    {
+        $methods = [RequestMethodInterface::METHOD_PURGE];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function safe(string $id, string $path) : RouteInterface
+    {
+        $methods = [
+            RequestMethodInterface::METHOD_HEAD,
+            RequestMethodInterface::METHOD_GET,
+        ];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function any(string $id, string $path) : RouteInterface
+    {
+        $methods = [
+            RequestMethodInterface::METHOD_HEAD,
+            RequestMethodInterface::METHOD_GET,
+            RequestMethodInterface::METHOD_POST,
+            RequestMethodInterface::METHOD_PUT,
+            RequestMethodInterface::METHOD_PATCH,
+            RequestMethodInterface::METHOD_DELETE,
+            RequestMethodInterface::METHOD_PURGE,
+            RequestMethodInterface::METHOD_OPTIONS,
+            RequestMethodInterface::METHOD_TRACE,
+            RequestMethodInterface::METHOD_CONNECT,
+        ];
+
+        return $this->route($id, $path, $methods);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function group(string $prefix, callable $callback) : void
+    {
+        $collection = new self;
+
+        $callback($collection);
+
+        foreach ($collection->getRoutes() as $route)
+        {
+            $route->addPrefix($prefix);
+
+            $this->addRoute($route);
+        }
+    }
 }

src/Exception/RouteNotFoundException.php

Indentation +28 added lines, -28 removed lines

@@ -23,32 +23,32 @@
 class RouteNotFoundException extends RuntimeException implements HttpExceptionInterface
 {
 
-	/**
-	 * Server Request instance
-	 *
-	 * @var ServerRequestInterface
-	 */
-	protected $request;
-
-	/**
-	 * Constructor of the class
-	 *
-	 * @param ServerRequestInterface $request
-	 * @param int $code
-	 * @param null|Throwable $previous
-	 */
-	public function __construct(ServerRequestInterface $request, int $code = 0, Throwable $previous = null)
-	{
-		$this->request = $request;
-
-		parent::__construct('Unable to find a route for the request', $code, $previous);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getRequest() : ServerRequestInterface
-	{
-		return $this->request;
-	}
+    /**
+     * Server Request instance
+     *
+     * @var ServerRequestInterface
+     */
+    protected $request;
+
+    /**
+     * Constructor of the class
+     *
+     * @param ServerRequestInterface $request
+     * @param int $code
+     * @param null|Throwable $previous
+     */
+    public function __construct(ServerRequestInterface $request, int $code = 0, Throwable $previous = null)
+    {
+        $this->request = $request;
+
+        parent::__construct('Unable to find a route for the request', $code, $previous);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequest() : ServerRequestInterface
+    {
+        return $this->request;
+    }
 }

src/Exception/MethodNotAllowedException.php

Indentation +51 added lines, -51 removed lines

@@ -24,61 +24,61 @@
 class MethodNotAllowedException extends RuntimeException implements HttpExceptionInterface
 {
 
-	/**
-	 * Server Request instance
-	 *
-	 * @var ServerRequestInterface
-	 */
-	protected $request;
+    /**
+     * Server Request instance
+     *
+     * @var ServerRequestInterface
+     */
+    protected $request;
 
-	/**
-	 * Allowed HTTP methods
-	 *
-	 * @var string[]
-	 */
-	protected $allowedMethods;
+    /**
+     * Allowed HTTP methods
+     *
+     * @var string[]
+     */
+    protected $allowedMethods;
 
-	/**
-	 * Constructor of the class
-	 *
-	 * @param ServerRequestInterface $request
-	 * @param string[] $allowedMethods
-	 * @param int $code
-	 * @param null|Throwable $previous
-	 */
-	public function __construct(ServerRequestInterface $request, array $allowedMethods, int $code = 0, Throwable $previous = null)
-	{
-		$this->request = $request;
-		$this->allowedMethods = $allowedMethods;
+    /**
+     * Constructor of the class
+     *
+     * @param ServerRequestInterface $request
+     * @param string[] $allowedMethods
+     * @param int $code
+     * @param null|Throwable $previous
+     */
+    public function __construct(ServerRequestInterface $request, array $allowedMethods, int $code = 0, Throwable $previous = null)
+    {
+        $this->request = $request;
+        $this->allowedMethods = $allowedMethods;
 
-		parent::__construct('The requested resource is not available for the HTTP method', $code, $previous);
-	}
+        parent::__construct('The requested resource is not available for the HTTP method', $code, $previous);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getRequest() : ServerRequestInterface
-	{
-		return $this->request;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequest() : ServerRequestInterface
+    {
+        return $this->request;
+    }
 
-	/**
-	 * Gets allowed HTTP methods
-	 *
-	 * @return string[]
-	 */
-	public function getAllowedMethods() : array
-	{
-		return $this->allowedMethods;
-	}
+    /**
+     * Gets allowed HTTP methods
+     *
+     * @return string[]
+     */
+    public function getAllowedMethods() : array
+    {
+        return $this->allowedMethods;
+    }
 
-	/**
-	 * Gets allowed HTTP methods as a string
-	 *
-	 * @return string
-	 */
-	public function getAllowedMethodsAsString() : string
-	{
-		return \implode(',', $this->allowedMethods);
-	}
+    /**
+     * Gets allowed HTTP methods as a string
+     *
+     * @return string
+     */
+    public function getAllowedMethodsAsString() : string
+    {
+        return \implode(',', $this->allowedMethods);
+    }
 }

src/Exception/HttpExceptionInterface.php

Indentation +6 added lines, -6 removed lines

@@ -22,10 +22,10 @@
 interface HttpExceptionInterface
 {
 
-	/**
-	 * Gets Server Request instance
-	 *
-	 * @return ServerRequestInterface
-	 */
-	public function getRequest() : ServerRequestInterface;
+    /**
+     * Gets Server Request instance
+     *
+     * @return ServerRequestInterface
+     */
+    public function getRequest() : ServerRequestInterface;
 }