codeburnerframework / routing

src/Collectors/ControllerCollectorTrait.php

Doc Comments +4 added lines

@@ -27,6 +27,10 @@
 {
 
     abstract public function getWildcards();
+
+    /**
+     * @return Reflector
+     */
     abstract public function set($method, $pattern, $action);
 
     /**

Indentation +214 added lines, -214 removed lines

@@ -26,220 +26,220 @@
 trait ControllerCollectorTrait
 {
 
-    abstract public function getWildcards();
-    abstract public function set($method, $pattern, $action);
-
-    /**
-     * Define how controller actions names will be joined to form the route pattern.
-     *
-     * @var string
-     */
-
-    protected $controllerActionJoin = "/";
-
-    /**
-     * Maps all the controller methods that begins with a HTTP method, and maps the rest of
-     * name as a path. The path will be the method name with slashes before every camelcased 
-     * word and without the HTTP method prefix, and the controller name will be used to prefix
-     * the route pattern. e.g. ArticlesController::getCreate will generate a route to: GET articles/create
-     *
-     * @param string $controller The controller name
-     * @param string $prefix
-     *
-     * @throws \ReflectionException
-     * @return Group
-     */
-
-    public function controller($controller, $prefix = null)
-    {
-        $controller = new ReflectionClass($controller);
-        $prefix     = $prefix === null ? $this->getControllerPrefix($controller) : $prefix;
-        $methods    = $controller->getMethods(ReflectionMethod::IS_PUBLIC);
-        return $this->collectControllerRoutes($controller, $methods, "/$prefix/");
-    }
-
-    /**
-     * Maps several controllers at same time.
-     *
-     * @param string[] $controllers Controllers name.
-     * @throws \ReflectionException
-     * @return Group
-     */
-
-    public function controllers(array $controllers)
-    {
-        $group = [];
-        foreach ($controllers as $controller)
-            $group[] = $this->controller($controller);
-        return new Group($group);
-    }
-
-    /**
-     * Alias for Collector::controller but maps a controller without using the controller name as prefix.
-     *
-     * @param string $controller The controller name
-     * @throws \ReflectionException
-     * @return Group
-     */
-
-    public function controllerWithoutPrefix($controller)
-    {
-        $controller = new ReflectionClass($controller);
-        $methods = $controller->getMethods(ReflectionMethod::IS_PUBLIC);
-        return $this->collectControllerRoutes($controller, $methods, "/");
-    }
-
-    /**
-     * Alias for Collector::controllers but maps a controller without using the controller name as prefix.
-     *
-     * @param string[] $controllers
-     * @throws \ReflectionException
-     * @return Group
-     */
-
-    public function controllersWithoutPrefix(array $controllers)
-    {
-        $group = [];
-        foreach ($controllers as $controller)
-            $group[] = $this->controllerWithoutPrefix($controller);
-        return new Group($group);
-    }
-
-    /**
-     * @param ReflectionClass $controller
-     * @param string[] $methods
-     * @param string $prefix
-     *
-     * @return Group
-     */
-
-    protected function collectControllerRoutes(ReflectionClass $controller, array $methods, $prefix)
-    {
-        $group = [];
-        $controllerDefaultStrategy = $this->getAnnotatedStrategy($controller);
-
-        /** @var ReflectionMethod $method */
-        foreach ($methods as $method) {
-            $name = preg_split("~(?=[A-Z])~", $method->name);
-            $http = $name[0];
-            unset($name[0]);
+	abstract public function getWildcards();
+	abstract public function set($method, $pattern, $action);
+
+	/**
+	 * Define how controller actions names will be joined to form the route pattern.
+	 *
+	 * @var string
+	 */
+
+	protected $controllerActionJoin = "/";
+
+	/**
+	 * Maps all the controller methods that begins with a HTTP method, and maps the rest of
+	 * name as a path. The path will be the method name with slashes before every camelcased 
+	 * word and without the HTTP method prefix, and the controller name will be used to prefix
+	 * the route pattern. e.g. ArticlesController::getCreate will generate a route to: GET articles/create
+	 *
+	 * @param string $controller The controller name
+	 * @param string $prefix
+	 *
+	 * @throws \ReflectionException
+	 * @return Group
+	 */
+
+	public function controller($controller, $prefix = null)
+	{
+		$controller = new ReflectionClass($controller);
+		$prefix     = $prefix === null ? $this->getControllerPrefix($controller) : $prefix;
+		$methods    = $controller->getMethods(ReflectionMethod::IS_PUBLIC);
+		return $this->collectControllerRoutes($controller, $methods, "/$prefix/");
+	}
+
+	/**
+	 * Maps several controllers at same time.
+	 *
+	 * @param string[] $controllers Controllers name.
+	 * @throws \ReflectionException
+	 * @return Group
+	 */
+
+	public function controllers(array $controllers)
+	{
+		$group = [];
+		foreach ($controllers as $controller)
+			$group[] = $this->controller($controller);
+		return new Group($group);
+	}
+
+	/**
+	 * Alias for Collector::controller but maps a controller without using the controller name as prefix.
+	 *
+	 * @param string $controller The controller name
+	 * @throws \ReflectionException
+	 * @return Group
+	 */
+
+	public function controllerWithoutPrefix($controller)
+	{
+		$controller = new ReflectionClass($controller);
+		$methods = $controller->getMethods(ReflectionMethod::IS_PUBLIC);
+		return $this->collectControllerRoutes($controller, $methods, "/");
+	}
+
+	/**
+	 * Alias for Collector::controllers but maps a controller without using the controller name as prefix.
+	 *
+	 * @param string[] $controllers
+	 * @throws \ReflectionException
+	 * @return Group
+	 */
+
+	public function controllersWithoutPrefix(array $controllers)
+	{
+		$group = [];
+		foreach ($controllers as $controller)
+			$group[] = $this->controllerWithoutPrefix($controller);
+		return new Group($group);
+	}
+
+	/**
+	 * @param ReflectionClass $controller
+	 * @param string[] $methods
+	 * @param string $prefix
+	 *
+	 * @return Group
+	 */
+
+	protected function collectControllerRoutes(ReflectionClass $controller, array $methods, $prefix)
+	{
+		$group = [];
+		$controllerDefaultStrategy = $this->getAnnotatedStrategy($controller);
+
+		/** @var ReflectionMethod $method */
+		foreach ($methods as $method) {
+			$name = preg_split("~(?=[A-Z])~", $method->name);
+			$http = $name[0];
+			unset($name[0]);
  
-            if (strpos(Collector::HTTP_METHODS, $http) !== false) {
-                $action  = $prefix . strtolower(implode($this->controllerActionJoin, $name));
-                $dynamic = $this->getMethodConstraints($method);
-
-                /** @var \Codeburner\Router\Route $route */
-                $route = $this->set($http, "$action$dynamic", [$controller->name, $method->name]);
-                $route->setStrategy($this->getAnnotatedStrategy($method) || $controllerDefaultStrategy);
-
-                $group[] = $route;
-            }
-        }
-
-        return new Group($group);
-    }
-
-    /**
-     * @param ReflectionClass $controller
-     *
-     * @return string
-     */
-
-    protected function getControllerPrefix(ReflectionClass $controller)
-    {
-        preg_match("~\@prefix\s([a-zA-Z\\\_]+)~i", (string) $controller->getDocComment(), $prefix);
-        return isset($prefix[1]) ? $prefix[1] : str_replace("controller", "", strtolower($controller->getShortName()));
-    }
-
-    /**
-     * @param \ReflectionMethod
-     * @return string
-     */
-
-    protected function getMethodConstraints(ReflectionMethod $method)
-    {
-        $beginPath = "";
-        $endPath = "";
-
-        if ($parameters = $method->getParameters()) {
-            $types = $this->getParamsConstraint($method);
-
-            foreach ($parameters as $parameter) {
-                if ($parameter->isOptional()) {
-                    $beginPath .= "[";
-                    $endPath .= "]";
-                }
-
-                $beginPath .= $this->getPathConstraint($parameter, $types);
-            }
-        }
-
-        return $beginPath . $endPath;
-    }
-
-    /**
-     * @param ReflectionParameter $parameter
-     * @param string[] $types
-     * @return string
-     */
-
-    protected function getPathConstraint(ReflectionParameter $parameter, $types)
-    {
-        $name = $parameter->name;
-        $path = "/{" . $name;
-        return isset($types[$name]) ? "$path:{$types[$name]}}" : "$path}";
-    }
-
-    /**
-     * @param ReflectionMethod $method
-     * @return string[]
-     */
-
-    protected function getParamsConstraint(ReflectionMethod $method)
-    {
-        $params = [];
-        preg_match_all("~\@param\s(" . implode("|", array_keys($this->getWildcards())) . "|\(.+\))\s\\$([a-zA-Z0-1_]+)~i",
-            $method->getDocComment(), $types, PREG_SET_ORDER);
-
-        foreach ((array) $types as $type) {
-            // if a pattern is defined on Match take it otherwise take the param type by PHPDoc.
-            $params[$type[2]] = isset($type[4]) ? $type[4] : $type[1];
-        }
-
-        return $params;
-    }
-
-    /**
-     * @param Reflector $reflector
-     * @return string|null
-     */
-
-    protected function getAnnotatedStrategy(Reflector $reflector)
-    {
-        preg_match("~\@strategy\s([a-zA-Z\\\_]+)~i", (string) $reflector->getDocComment(), $strategy);
-        return isset($strategy[1]) ? $strategy[1] : null;
-    }
-
-    /**
-     * Define how controller actions names will be joined to form the route pattern.
-     * Defaults to "/" so actions like "getMyAction" will be "/my/action". If changed to
-     * "-" the new pattern will be "/my-action".
-     *
-     * @param string $join
-     */
-
-    public function setControllerActionJoin($join)
-    {
-        $this->controllerActionJoin = $join;
-    }
-
-    /**
-     * @return string
-     */
-
-    public function getControllerActionJoin()
-    {
-        return $this->controllerActionJoin;
-    }
+			if (strpos(Collector::HTTP_METHODS, $http) !== false) {
+				$action  = $prefix . strtolower(implode($this->controllerActionJoin, $name));
+				$dynamic = $this->getMethodConstraints($method);
+
+				/** @var \Codeburner\Router\Route $route */
+				$route = $this->set($http, "$action$dynamic", [$controller->name, $method->name]);
+				$route->setStrategy($this->getAnnotatedStrategy($method) || $controllerDefaultStrategy);
+
+				$group[] = $route;
+			}
+		}
+
+		return new Group($group);
+	}
+
+	/**
+	 * @param ReflectionClass $controller
+	 *
+	 * @return string
+	 */
+
+	protected function getControllerPrefix(ReflectionClass $controller)
+	{
+		preg_match("~\@prefix\s([a-zA-Z\\\_]+)~i", (string) $controller->getDocComment(), $prefix);
+		return isset($prefix[1]) ? $prefix[1] : str_replace("controller", "", strtolower($controller->getShortName()));
+	}
+
+	/**
+	 * @param \ReflectionMethod
+	 * @return string
+	 */
+
+	protected function getMethodConstraints(ReflectionMethod $method)
+	{
+		$beginPath = "";
+		$endPath = "";
+
+		if ($parameters = $method->getParameters()) {
+			$types = $this->getParamsConstraint($method);
+
+			foreach ($parameters as $parameter) {
+				if ($parameter->isOptional()) {
+					$beginPath .= "[";
+					$endPath .= "]";
+				}
+
+				$beginPath .= $this->getPathConstraint($parameter, $types);
+			}
+		}
+
+		return $beginPath . $endPath;
+	}
+
+	/**
+	 * @param ReflectionParameter $parameter
+	 * @param string[] $types
+	 * @return string
+	 */
+
+	protected function getPathConstraint(ReflectionParameter $parameter, $types)
+	{
+		$name = $parameter->name;
+		$path = "/{" . $name;
+		return isset($types[$name]) ? "$path:{$types[$name]}}" : "$path}";
+	}
+
+	/**
+	 * @param ReflectionMethod $method
+	 * @return string[]
+	 */
+
+	protected function getParamsConstraint(ReflectionMethod $method)
+	{
+		$params = [];
+		preg_match_all("~\@param\s(" . implode("|", array_keys($this->getWildcards())) . "|\(.+\))\s\\$([a-zA-Z0-1_]+)~i",
+			$method->getDocComment(), $types, PREG_SET_ORDER);
+
+		foreach ((array) $types as $type) {
+			// if a pattern is defined on Match take it otherwise take the param type by PHPDoc.
+			$params[$type[2]] = isset($type[4]) ? $type[4] : $type[1];
+		}
+
+		return $params;
+	}
+
+	/**
+	 * @param Reflector $reflector
+	 * @return string|null
+	 */
+
+	protected function getAnnotatedStrategy(Reflector $reflector)
+	{
+		preg_match("~\@strategy\s([a-zA-Z\\\_]+)~i", (string) $reflector->getDocComment(), $strategy);
+		return isset($strategy[1]) ? $strategy[1] : null;
+	}
+
+	/**
+	 * Define how controller actions names will be joined to form the route pattern.
+	 * Defaults to "/" so actions like "getMyAction" will be "/my/action". If changed to
+	 * "-" the new pattern will be "/my-action".
+	 *
+	 * @param string $join
+	 */
+
+	public function setControllerActionJoin($join)
+	{
+		$this->controllerActionJoin = $join;
+	}
+
+	/**
+	 * @return string
+	 */
+
+	public function getControllerActionJoin()
+	{
+		return $this->controllerActionJoin;
+	}
 
 }

Braces +6 added lines, -4 removed lines

@@ -69,8 +69,9 @@ 
     public function controllers(array $controllers)
     {
         $group = [];
-        foreach ($controllers as $controller)
-            $group[] = $this->controller($controller);
+        foreach ($controllers as $controller) {
+                    $group[] = $this->controller($controller);
+        }
         return new Group($group);
     }
 
@@ -100,8 +101,9 @@ 
     public function controllersWithoutPrefix(array $controllers)
     {
         $group = [];
-        foreach ($controllers as $controller)
-            $group[] = $this->controllerWithoutPrefix($controller);
+        foreach ($controllers as $controller) {
+                    $group[] = $this->controllerWithoutPrefix($controller);
+        }
         return new Group($group);
     }
 

src/Matcher.php

Doc Comments +2 added lines, -1 removed lines

@@ -246,7 +246,7 @@ 
      * @param string $targetHttpMethod The HTTP method that must not be checked
      * @param string $path             The Path that must be matched.
      *
-     * @return array
+     * @return string
      */
 
     protected function checkDynamicRouteInOtherMethods($targetHttpMethod, $path)
@@ -260,6 +260,7 @@ 
      * Strip the given http methods and return all the others.
      *
      * @param  array|string
+     * @param string $targetHttpMethod
      * @return array
      */
 

Indentation +272 added lines, -272 removed lines

@@ -23,279 +23,279 @@
 class Matcher
 {
 
-    /**
-     * @var Collector
-     */
-
-    protected $collector;
-
-    /**
-     * Define a basepath to all routes.
-     *
-     * @var string
-     */
-
-    protected $basepath = "";
-
-    /**
-     * Construct the route dispatcher.
-     *
-     * @param Collector $collector
-     * @param string $basepath Define a Path prefix that must be excluded on matches.
-     */
-
-    public function __construct(Collector $collector, $basepath = "")
-    {
-        $this->collector = $collector;
-        $this->basepath  = $basepath;
-    }
-
-    /**
-     * Find a route that matches the given arguments.
-     * 
-     * @param string $httpMethod
-     * @param string $path
-     *
-     * @throws NotFoundException
-     * @throws MethodNotAllowedException
-     *
-     * @return Route
-     */
-
-    public function match($httpMethod, $path)
-    {
-        $path = $this->parsePath($path);
-
-        if ($route = $this->collector->findStaticRoute($httpMethod, $path)) {
-            return $route;
-        }
-
-        if ($route = $this->matchDynamicRoute($httpMethod, $path)) {
-            return $route;
-        }
-
-        $this->matchSimilarRoute($httpMethod, $path);
-    }
-
-    /**
-     * Find and return the request dynamic route based on the compiled data and Path.
-     *
-     * @param string $httpMethod
-     * @param string $path
-     *
-     * @return Route|false If the request match an array with the action and parameters will
-     *                     be returned otherwise a false will.
-     */
-
-    protected function matchDynamicRoute($httpMethod, $path)
-    {
-        $routes = $this->collector->findDynamicRoutes($httpMethod, $path);
-
-        if (!$routes) {
-            return false;
-        }
-
-        // chunk routes for smaller regex groups using the Sturges' Formula
-        foreach (array_chunk($routes, round(1 + 3.3 * log(count($routes))), true) as $chunk)
-        {
-            array_map([$this, "buildRoute"], $chunk);
-            list($pattern, $map) = $this->buildGroup($chunk);
-
-            if (!preg_match($pattern, $path, $matches)) {
-                continue;
-            }
-
-            /** @var Route $route */
-            $route = $map[count($matches)];
-            // removing the Path from array.
-            unset($matches[0]);
-            // sometimes null values come with the matches so the array_filter must be called first.
-            $route->setParams(array_combine($route->getParams(), array_filter($matches)));
-            // route must know who match them
-            $route->setMatcher($this);
-
-            return $route;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parse the dynamic segments of the pattern and replace then for
-     * corresponding regex.
-     *
-     * @param Route $route
-     * @return Route
-     */
-
-    protected function buildRoute(Route $route)
-    {
-        if ($route->blocked()) {
-            return $route;
-        }
+	/**
+	 * @var Collector
+	 */
+
+	protected $collector;
+
+	/**
+	 * Define a basepath to all routes.
+	 *
+	 * @var string
+	 */
+
+	protected $basepath = "";
+
+	/**
+	 * Construct the route dispatcher.
+	 *
+	 * @param Collector $collector
+	 * @param string $basepath Define a Path prefix that must be excluded on matches.
+	 */
+
+	public function __construct(Collector $collector, $basepath = "")
+	{
+		$this->collector = $collector;
+		$this->basepath  = $basepath;
+	}
+
+	/**
+	 * Find a route that matches the given arguments.
+	 * 
+	 * @param string $httpMethod
+	 * @param string $path
+	 *
+	 * @throws NotFoundException
+	 * @throws MethodNotAllowedException
+	 *
+	 * @return Route
+	 */
+
+	public function match($httpMethod, $path)
+	{
+		$path = $this->parsePath($path);
+
+		if ($route = $this->collector->findStaticRoute($httpMethod, $path)) {
+			return $route;
+		}
+
+		if ($route = $this->matchDynamicRoute($httpMethod, $path)) {
+			return $route;
+		}
+
+		$this->matchSimilarRoute($httpMethod, $path);
+	}
+
+	/**
+	 * Find and return the request dynamic route based on the compiled data and Path.
+	 *
+	 * @param string $httpMethod
+	 * @param string $path
+	 *
+	 * @return Route|false If the request match an array with the action and parameters will
+	 *                     be returned otherwise a false will.
+	 */
+
+	protected function matchDynamicRoute($httpMethod, $path)
+	{
+		$routes = $this->collector->findDynamicRoutes($httpMethod, $path);
+
+		if (!$routes) {
+			return false;
+		}
+
+		// chunk routes for smaller regex groups using the Sturges' Formula
+		foreach (array_chunk($routes, round(1 + 3.3 * log(count($routes))), true) as $chunk)
+		{
+			array_map([$this, "buildRoute"], $chunk);
+			list($pattern, $map) = $this->buildGroup($chunk);
+
+			if (!preg_match($pattern, $path, $matches)) {
+				continue;
+			}
+
+			/** @var Route $route */
+			$route = $map[count($matches)];
+			// removing the Path from array.
+			unset($matches[0]);
+			// sometimes null values come with the matches so the array_filter must be called first.
+			$route->setParams(array_combine($route->getParams(), array_filter($matches)));
+			// route must know who match them
+			$route->setMatcher($this);
+
+			return $route;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parse the dynamic segments of the pattern and replace then for
+	 * corresponding regex.
+	 *
+	 * @param Route $route
+	 * @return Route
+	 */
+
+	protected function buildRoute(Route $route)
+	{
+		if ($route->blocked()) {
+			return $route;
+		}
         
-        list($pattern, $params) = $this->parsePlaceholders($route->getPattern());
-        return  $route->setPatternWithoutReset($pattern)->setParams($params)->block();
-    }
-
-    /**
-     * Group several dynamic routes patterns into one big regex and maps
-     * the routes to the pattern positions in the big regex.
-     *
-     * @param array $routes
-     * @return array
-     */
-
-    protected function buildGroup(array $routes)
-    {
-        $groupCount = (int) $map = $regex = [];
-
-        /** @var Route $route */
-        foreach ($routes as $route) {
-            $params           = $route->getParams();
-            $paramsCount      = count($params);
-            $groupCount       = max($groupCount, $paramsCount) + 1;
-            $regex[]          = $route->getPattern() . str_repeat("()", $groupCount - $paramsCount - 1);
-            $map[$groupCount] = $route;
-        }
-
-        return ["~^(?|" . implode("|", $regex) . ")$~", $map];
-    }
-
-    /**
-     * Parse an route pattern seeking for parameters and build the route regex.
-     *
-     * @param string $pattern
-     * @return array 0 => new route regex, 1 => map of parameter names
-     */
-
-    protected function parsePlaceholders($pattern)
-    {
-        $params = [];
-        preg_match_all("~" . Collector::DYNAMIC_REGEX . "~x", $pattern, $matches, PREG_SET_ORDER);
-
-        foreach ((array) $matches as $key => $match) {
-            $pattern = str_replace($match[0], isset($match[2]) ? "({$match[2]})" : "([^/]+)", $pattern);
-            $params[$key] = $match[1];
-        }
-
-        return [$pattern, $params];
-    }
-
-    /**
-     * Get only the path of a given url.
-     *
-     * @param string $path The given URL
-     *
-     * @throws Exception
-     * @return string
-     */
-
-    protected function parsePath($path)
-    {
-        $path = parse_url(substr(strstr(";" . $path, ";" . $this->basepath), strlen(";" . $this->basepath)), PHP_URL_PATH);
-
-        if ($path === false) {
-            throw new Exception("Seriously malformed URL passed to route dispatcher.");
-        }
-
-        return $path;
-    }
-
-    /**
-     * Generate an HTTP error request with method not allowed or not found.
-     *
-     * @param string $httpMethod
-     * @param string $path
-     *
-     * @throws NotFoundException
-     * @throws MethodNotAllowedException
-     */
-
-    protected function matchSimilarRoute($httpMethod, $path)
-    {
-        $sm = $dm = [];
-
-        if ($sm = ($this->checkStaticRouteInOtherMethods($httpMethod, $path)) 
-                || $dm = ($this->checkDynamicRouteInOtherMethods($httpMethod, $path))) {
-            throw new MethodNotAllowedException($httpMethod, $path, array_merge((array) $sm, (array) $dm));
-        }
-
-        throw new NotFoundException($httpMethod, $path);
-    }
-
-    /**
-     * Verify if a static route match in another method than the requested.
-     *
-     * @param string $targetHttpMethod The HTTP method that must not be checked
-     * @param string $path              The Path that must be matched.
-     *
-     * @return array
-     */
-
-    protected function checkStaticRouteInOtherMethods($targetHttpMethod, $path)
-    {
-        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
-            return (bool) $this->collector->findStaticRoute($httpMethod, $path);
-        });
-    }
-
-    /**
-     * Verify if a dynamic route match in another method than the requested.
-     *
-     * @param string $targetHttpMethod The HTTP method that must not be checked
-     * @param string $path             The Path that must be matched.
-     *
-     * @return array
-     */
-
-    protected function checkDynamicRouteInOtherMethods($targetHttpMethod, $path)
-    {
-        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
-            return (bool) $this->matchDynamicRoute($httpMethod, $path);
-        });
-    }
-
-    /**
-     * Strip the given http methods and return all the others.
-     *
-     * @param  array|string
-     * @return array
-     */
-
-    protected function getHttpMethodsBut($targetHttpMethod)
-    {
-        return array_diff(explode(" ", Collector::HTTP_METHODS), (array) $targetHttpMethod);
-    }
-
-    /**
-     * @return Collector
-     */
-
-    public function getCollector()
-    {
-        return $this->collector;
-    }
-
-    /**
-     * @return string
-     */
-
-    public function getBasePath()
-    {
-        return $this->basepath;
-    }
-
-    /**
-     * Set a new basepath, this will be a prefix that must be excluded in
-     * every requested Path.
-     *
-     * @param string $basepath The new basepath
-     */
+		list($pattern, $params) = $this->parsePlaceholders($route->getPattern());
+		return  $route->setPatternWithoutReset($pattern)->setParams($params)->block();
+	}
+
+	/**
+	 * Group several dynamic routes patterns into one big regex and maps
+	 * the routes to the pattern positions in the big regex.
+	 *
+	 * @param array $routes
+	 * @return array
+	 */
+
+	protected function buildGroup(array $routes)
+	{
+		$groupCount = (int) $map = $regex = [];
+
+		/** @var Route $route */
+		foreach ($routes as $route) {
+			$params           = $route->getParams();
+			$paramsCount      = count($params);
+			$groupCount       = max($groupCount, $paramsCount) + 1;
+			$regex[]          = $route->getPattern() . str_repeat("()", $groupCount - $paramsCount - 1);
+			$map[$groupCount] = $route;
+		}
+
+		return ["~^(?|" . implode("|", $regex) . ")$~", $map];
+	}
+
+	/**
+	 * Parse an route pattern seeking for parameters and build the route regex.
+	 *
+	 * @param string $pattern
+	 * @return array 0 => new route regex, 1 => map of parameter names
+	 */
+
+	protected function parsePlaceholders($pattern)
+	{
+		$params = [];
+		preg_match_all("~" . Collector::DYNAMIC_REGEX . "~x", $pattern, $matches, PREG_SET_ORDER);
+
+		foreach ((array) $matches as $key => $match) {
+			$pattern = str_replace($match[0], isset($match[2]) ? "({$match[2]})" : "([^/]+)", $pattern);
+			$params[$key] = $match[1];
+		}
+
+		return [$pattern, $params];
+	}
+
+	/**
+	 * Get only the path of a given url.
+	 *
+	 * @param string $path The given URL
+	 *
+	 * @throws Exception
+	 * @return string
+	 */
+
+	protected function parsePath($path)
+	{
+		$path = parse_url(substr(strstr(";" . $path, ";" . $this->basepath), strlen(";" . $this->basepath)), PHP_URL_PATH);
+
+		if ($path === false) {
+			throw new Exception("Seriously malformed URL passed to route dispatcher.");
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Generate an HTTP error request with method not allowed or not found.
+	 *
+	 * @param string $httpMethod
+	 * @param string $path
+	 *
+	 * @throws NotFoundException
+	 * @throws MethodNotAllowedException
+	 */
+
+	protected function matchSimilarRoute($httpMethod, $path)
+	{
+		$sm = $dm = [];
+
+		if ($sm = ($this->checkStaticRouteInOtherMethods($httpMethod, $path)) 
+				|| $dm = ($this->checkDynamicRouteInOtherMethods($httpMethod, $path))) {
+			throw new MethodNotAllowedException($httpMethod, $path, array_merge((array) $sm, (array) $dm));
+		}
+
+		throw new NotFoundException($httpMethod, $path);
+	}
+
+	/**
+	 * Verify if a static route match in another method than the requested.
+	 *
+	 * @param string $targetHttpMethod The HTTP method that must not be checked
+	 * @param string $path              The Path that must be matched.
+	 *
+	 * @return array
+	 */
+
+	protected function checkStaticRouteInOtherMethods($targetHttpMethod, $path)
+	{
+		return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
+			return (bool) $this->collector->findStaticRoute($httpMethod, $path);
+		});
+	}
+
+	/**
+	 * Verify if a dynamic route match in another method than the requested.
+	 *
+	 * @param string $targetHttpMethod The HTTP method that must not be checked
+	 * @param string $path             The Path that must be matched.
+	 *
+	 * @return array
+	 */
+
+	protected function checkDynamicRouteInOtherMethods($targetHttpMethod, $path)
+	{
+		return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
+			return (bool) $this->matchDynamicRoute($httpMethod, $path);
+		});
+	}
+
+	/**
+	 * Strip the given http methods and return all the others.
+	 *
+	 * @param  array|string
+	 * @return array
+	 */
+
+	protected function getHttpMethodsBut($targetHttpMethod)
+	{
+		return array_diff(explode(" ", Collector::HTTP_METHODS), (array) $targetHttpMethod);
+	}
+
+	/**
+	 * @return Collector
+	 */
+
+	public function getCollector()
+	{
+		return $this->collector;
+	}
+
+	/**
+	 * @return string
+	 */
+
+	public function getBasePath()
+	{
+		return $this->basepath;
+	}
+
+	/**
+	 * Set a new basepath, this will be a prefix that must be excluded in
+	 * every requested Path.
+	 *
+	 * @param string $basepath The new basepath
+	 */
     
-    public function setBasePath($basepath)
-    {
-        $this->basepath = $basepath;
-    }
+	public function setBasePath($basepath)
+	{
+		$this->basepath = $basepath;
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -235,7 +235,7 @@ 
 
     protected function checkStaticRouteInOtherMethods($targetHttpMethod, $path)
     {
-        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
+        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function($httpMethod) use ($path) {
             return (bool) $this->collector->findStaticRoute($httpMethod, $path);
         });
     }
@@ -251,7 +251,7 @@ 
 
     protected function checkDynamicRouteInOtherMethods($targetHttpMethod, $path)
     {
-        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function ($httpMethod) use ($path) {
+        return array_filter($this->getHttpMethodsBut($targetHttpMethod), function($httpMethod) use ($path) {
             return (bool) $this->matchDynamicRoute($httpMethod, $path);
         });
     }

src/Collector.php

Indentation +316 added lines, -316 removed lines

@@ -33,321 +33,321 @@
 class Collector
 {
 
-    use Collectors\ControllerCollectorTrait;
-    use Collectors\ResourceCollectorTrait;
-
-    /**
-     * These regex define the structure of a dynamic segment in a pattern.
-     *
-     * @var string
-     */
-
-    const DYNAMIC_REGEX = "{\s*(\w*)\s*(?::\s*([^{}]*(?:{(?-1)}*)*))?\s*}";
-
-
-    /**
-     * All the supported http methods separated by spaces.
-     *
-     * @var string
-     */
-
-    const HTTP_METHODS = "get post put patch delete";
-
-    /**
-     * The static routes are simple stored in a multidimensional array, the first
-     * dimension is indexed by an http method and hold an array indexed with the patterns
-     * and holding the route. ex. [METHOD => [PATTERN => ROUTE]]
-     *
-     * @var array
-     */
-
-    protected $statics  = [];
-
-    /**
-     * The dynamic routes have parameters and are stored in a hashtable that every cell have
-     * an array with route patterns as indexes and routes as values. ex. [INDEX => [PATTERN => ROUTE]]
-     *
-     * @var array
-     */
-
-    protected $dynamics = [];
-
-    /**
-     * Some regex wildcards for easily definition of dynamic routes.
-     *
-     * @var array
-     */
-
-    protected $wildcards = [
-        "uid"     => "uid-[a-zA-Z0-9]",
-        "slug"    => "[a-z0-9-]",
-        "string"  => "\w",
-        "int"     => "\d",
-        "integer" => "\d",
-        "float"   => "[-+]?\d*?[.]?\d",
-        "double"  => "[-+]?\d*?[.]?\d",
-        "hex"     => "0[xX][0-9a-fA-F]",
-        "octal"   => "0[1-7][0-7]",
-        "bool"    => "1|0|true|false|yes|no",
-        "boolean" => "1|0|true|false|yes|no",
-    ];
-
-    /**
-     * @param string   $method
-     * @param string   $pattern
-     * @param callable $action
-     *
-     * @throws BadRouteException 
-     * @throws MethodNotSupportedException
-     *
-     * @return Group
-     */
-
-    public function set($method, $pattern, $action)
-    {
-        $method   = $this->parseMethod($method);
-        $patterns = $this->parsePattern($pattern);
-        $group    = [];
-
-        foreach ($patterns as $pattern)
-        {
-            $route   = new Route($this, $method, $pattern, $action);
-            $group[] = $route;
-
-            if (strpos($pattern, "{") !== false) {
-                   $index = $this->getDynamicIndex($method, $pattern);
-                   $this->dynamics[$index][$pattern] = $route;
-            } else $this->statics[$method][$pattern] = $route;
-        }
-
-        return new Group($group);
-    }
-
-    public function get   ($pattern, $action) { return $this->set("get"   , $pattern, $action); }
-    public function post  ($pattern, $action) { return $this->set("post"  , $pattern, $action); }
-    public function put   ($pattern, $action) { return $this->set("put"   , $pattern, $action); }
-    public function patch ($pattern, $action) { return $this->set("patch" , $pattern, $action); }
-    public function delete($pattern, $action) { return $this->set("delete", $pattern, $action); }
-
-    /**
-     * Insert a route into several http methods.
-     *
-     * @param string[] $methods
-     * @param string   $pattern
-     * @param Callable $action
-     *
-     * @return Group
-     */
-
-    public function match(array $methods, $pattern, $action)
-    {
-        $group = [];
-        foreach ($methods as $method)
-            $group[] = $this->set($method, $pattern, $action);
-        return new Group($group);
-    }
-
-    /**
-     * Insert a route into every http method supported.
-     *
-     * @param string   $pattern
-     * @param Callable $action
-     *
-     * @return Group
-     */
-
-    public function any($pattern, $action)
-    {
-        return $this->match(explode(" ", self::HTTP_METHODS), $pattern, $action);
-    }
-
-    /**
-     * Insert a route into every http method supported but the given ones.
-     *
-     * @param string[] $methods
-     * @param string   $pattern
-     * @param Callable $action
-     *
-     * @return Group
-     */
-
-    public function except(array $methods, $pattern, $action)
-    {
-        return $this->match(array_diff(explode(" ", self::HTTP_METHODS), $methods), $pattern, $action);
-    }
-
-    /**
-     * Group all given routes.
-     *
-     * @param Route[] $routes
-     * @return Group
-     */
-
-    public function group(array $routes)
-    {
-        $group = [];
-        foreach ($routes as $route)
-            $group[] = $route;
-        return new Group($group);
-    }
-
-    /**
-     * Remove a route from collector.
-     *
-     * @param string $method
-     * @param string $pattern
-     */
-
-    public function forget($method, $pattern)
-    {
-        if (strpos($pattern, "{") === false) {
-               unset($this->statics[$method][$pattern]);
-        } else unset($this->dynamics[$this->getDynamicIndex($method, $pattern)][$pattern]);
-    }
-
-    /**
-     * Determine if the http method is valid.
-     *
-     * @param string $method
-     * @throws MethodNotSupportedException
-     * @return string
-     */
-
-    protected function parseMethod($method)
-    {
-        $method = strtolower($method);
-
-        if (strpos(self::HTTP_METHODS, $method) === false) {
-            throw new MethodNotSupportedException($method);
-        }
-
-        return $method;
-    }
-
-    /**
-     * Separate routes pattern with optional parts into n new patterns.
-     *
-     * @param  string $pattern
-     * @return array
-     */
-
-    protected function parsePattern($pattern)
-    {
-        $withoutClosing = rtrim($pattern, "]");
-        $closingNumber  = strlen($pattern) - strlen($withoutClosing);
-
-        $segments = preg_split("~" . self::DYNAMIC_REGEX . "(*SKIP)(*F)|\[~x", $withoutClosing);
-        $this->parseSegments($segments, $closingNumber, $withoutClosing);
-
-        return $this->buildSegments($segments);
-    }
-
-    /**
-     * Parse all the possible patterns seeking for an incorrect or incompatible pattern.
-     *
-     * @param string[] $segments       Segments are all the possible patterns made on top of a pattern with optional segments.
-     * @param int      $closingNumber  The count of optional segments.
-     * @param string   $withoutClosing The pattern without the closing token of an optional segment. aka: ]
-     *
-     * @throws BadRouteException
-     */
-
-    protected function parseSegments(array $segments, $closingNumber, $withoutClosing)
-    {
-        if ($closingNumber !== count($segments) - 1) {
-            if (preg_match("~" . self::DYNAMIC_REGEX . "(*SKIP)(*F)|\]~x", $withoutClosing)) {
-                   throw new BadRouteException(BadRouteException::OPTIONAL_SEGMENTS_ON_MIDDLE);
-            } else throw new BadRouteException(BadRouteException::UNCLOSED_OPTIONAL_SEGMENTS);
-        }
-    }
-
-    /**
-     * @param string[] $segments
-     *
-     * @throws BadRouteException
-     * @return array
-     */
-
-    protected function buildSegments(array $segments)
-    {
-        $pattern  = "";
-        $patterns = [];
-        $wildcardTokens = [];
-        $wildcardRegex  = [];
-
-        foreach ($this->wildcards as $token => $regex) {
-            $wildcardTokens[] = ":$token";
-            $wildcardRegex [] = ":$regex";
-        }
-
-        foreach ($segments as $n => $segment) {
-            if ($segment === "" && $n !== 0) {
-                throw new BadRouteException(BadRouteException::EMPTY_OPTIONAL_PARTS);
-            }
-
-            $patterns[] = $pattern .= str_replace($wildcardTokens, $wildcardRegex, $segment);
-        }
-
-        return $patterns;
-    }
-
-    /**
-     * @param string $method
-     * @param string $pattern
-     *
-     * @return array|false
-     */
-
-    public function findStaticRoute($method, $pattern)
-    {
-        $method = strtolower($method);
-        if (isset($this->statics[$method]) && isset($this->statics[$method][$pattern]))
-            return $this->statics[$method][$pattern];
-        return false;
-    }
-
-    /**
-     * @param string $method
-     * @param string $pattern
-     *
-     * @return array|false
-     */
-
-    public function findDynamicRoutes($method, $pattern)
-    {
-        $index = $this->getDynamicIndex($method, $pattern);
-        return isset($this->dynamics[$index]) ? $this->dynamics[$index] : false;
-    }
-
-    /**
-     * @param string $method
-     * @param string $pattern
-     *
-     * @return int
-     */
-
-    protected function getDynamicIndex($method, $pattern)
-    {
-        return crc32(strtolower($method)) + substr_count($pattern, "/");
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getWildcards()
-    {
-        return $this->wildcards;
-    }
-
-    /**
-     * @param string $pattern
-     * @param string $wildcard
-     */
-
-    public function setWildcard($pattern, $wildcard)
-    {
-        $this->wildcards[$pattern] = $wildcard;
-    }
+	use Collectors\ControllerCollectorTrait;
+	use Collectors\ResourceCollectorTrait;
+
+	/**
+	 * These regex define the structure of a dynamic segment in a pattern.
+	 *
+	 * @var string
+	 */
+
+	const DYNAMIC_REGEX = "{\s*(\w*)\s*(?::\s*([^{}]*(?:{(?-1)}*)*))?\s*}";
+
+
+	/**
+	 * All the supported http methods separated by spaces.
+	 *
+	 * @var string
+	 */
+
+	const HTTP_METHODS = "get post put patch delete";
+
+	/**
+	 * The static routes are simple stored in a multidimensional array, the first
+	 * dimension is indexed by an http method and hold an array indexed with the patterns
+	 * and holding the route. ex. [METHOD => [PATTERN => ROUTE]]
+	 *
+	 * @var array
+	 */
+
+	protected $statics  = [];
+
+	/**
+	 * The dynamic routes have parameters and are stored in a hashtable that every cell have
+	 * an array with route patterns as indexes and routes as values. ex. [INDEX => [PATTERN => ROUTE]]
+	 *
+	 * @var array
+	 */
+
+	protected $dynamics = [];
+
+	/**
+	 * Some regex wildcards for easily definition of dynamic routes.
+	 *
+	 * @var array
+	 */
+
+	protected $wildcards = [
+		"uid"     => "uid-[a-zA-Z0-9]",
+		"slug"    => "[a-z0-9-]",
+		"string"  => "\w",
+		"int"     => "\d",
+		"integer" => "\d",
+		"float"   => "[-+]?\d*?[.]?\d",
+		"double"  => "[-+]?\d*?[.]?\d",
+		"hex"     => "0[xX][0-9a-fA-F]",
+		"octal"   => "0[1-7][0-7]",
+		"bool"    => "1|0|true|false|yes|no",
+		"boolean" => "1|0|true|false|yes|no",
+	];
+
+	/**
+	 * @param string   $method
+	 * @param string   $pattern
+	 * @param callable $action
+	 *
+	 * @throws BadRouteException 
+	 * @throws MethodNotSupportedException
+	 *
+	 * @return Group
+	 */
+
+	public function set($method, $pattern, $action)
+	{
+		$method   = $this->parseMethod($method);
+		$patterns = $this->parsePattern($pattern);
+		$group    = [];
+
+		foreach ($patterns as $pattern)
+		{
+			$route   = new Route($this, $method, $pattern, $action);
+			$group[] = $route;
+
+			if (strpos($pattern, "{") !== false) {
+				   $index = $this->getDynamicIndex($method, $pattern);
+				   $this->dynamics[$index][$pattern] = $route;
+			} else $this->statics[$method][$pattern] = $route;
+		}
+
+		return new Group($group);
+	}
+
+	public function get   ($pattern, $action) { return $this->set("get"   , $pattern, $action); }
+	public function post  ($pattern, $action) { return $this->set("post"  , $pattern, $action); }
+	public function put   ($pattern, $action) { return $this->set("put"   , $pattern, $action); }
+	public function patch ($pattern, $action) { return $this->set("patch" , $pattern, $action); }
+	public function delete($pattern, $action) { return $this->set("delete", $pattern, $action); }
+
+	/**
+	 * Insert a route into several http methods.
+	 *
+	 * @param string[] $methods
+	 * @param string   $pattern
+	 * @param Callable $action
+	 *
+	 * @return Group
+	 */
+
+	public function match(array $methods, $pattern, $action)
+	{
+		$group = [];
+		foreach ($methods as $method)
+			$group[] = $this->set($method, $pattern, $action);
+		return new Group($group);
+	}
+
+	/**
+	 * Insert a route into every http method supported.
+	 *
+	 * @param string   $pattern
+	 * @param Callable $action
+	 *
+	 * @return Group
+	 */
+
+	public function any($pattern, $action)
+	{
+		return $this->match(explode(" ", self::HTTP_METHODS), $pattern, $action);
+	}
+
+	/**
+	 * Insert a route into every http method supported but the given ones.
+	 *
+	 * @param string[] $methods
+	 * @param string   $pattern
+	 * @param Callable $action
+	 *
+	 * @return Group
+	 */
+
+	public function except(array $methods, $pattern, $action)
+	{
+		return $this->match(array_diff(explode(" ", self::HTTP_METHODS), $methods), $pattern, $action);
+	}
+
+	/**
+	 * Group all given routes.
+	 *
+	 * @param Route[] $routes
+	 * @return Group
+	 */
+
+	public function group(array $routes)
+	{
+		$group = [];
+		foreach ($routes as $route)
+			$group[] = $route;
+		return new Group($group);
+	}
+
+	/**
+	 * Remove a route from collector.
+	 *
+	 * @param string $method
+	 * @param string $pattern
+	 */
+
+	public function forget($method, $pattern)
+	{
+		if (strpos($pattern, "{") === false) {
+			   unset($this->statics[$method][$pattern]);
+		} else unset($this->dynamics[$this->getDynamicIndex($method, $pattern)][$pattern]);
+	}
+
+	/**
+	 * Determine if the http method is valid.
+	 *
+	 * @param string $method
+	 * @throws MethodNotSupportedException
+	 * @return string
+	 */
+
+	protected function parseMethod($method)
+	{
+		$method = strtolower($method);
+
+		if (strpos(self::HTTP_METHODS, $method) === false) {
+			throw new MethodNotSupportedException($method);
+		}
+
+		return $method;
+	}
+
+	/**
+	 * Separate routes pattern with optional parts into n new patterns.
+	 *
+	 * @param  string $pattern
+	 * @return array
+	 */
+
+	protected function parsePattern($pattern)
+	{
+		$withoutClosing = rtrim($pattern, "]");
+		$closingNumber  = strlen($pattern) - strlen($withoutClosing);
+
+		$segments = preg_split("~" . self::DYNAMIC_REGEX . "(*SKIP)(*F)|\[~x", $withoutClosing);
+		$this->parseSegments($segments, $closingNumber, $withoutClosing);
+
+		return $this->buildSegments($segments);
+	}
+
+	/**
+	 * Parse all the possible patterns seeking for an incorrect or incompatible pattern.
+	 *
+	 * @param string[] $segments       Segments are all the possible patterns made on top of a pattern with optional segments.
+	 * @param int      $closingNumber  The count of optional segments.
+	 * @param string   $withoutClosing The pattern without the closing token of an optional segment. aka: ]
+	 *
+	 * @throws BadRouteException
+	 */
+
+	protected function parseSegments(array $segments, $closingNumber, $withoutClosing)
+	{
+		if ($closingNumber !== count($segments) - 1) {
+			if (preg_match("~" . self::DYNAMIC_REGEX . "(*SKIP)(*F)|\]~x", $withoutClosing)) {
+				   throw new BadRouteException(BadRouteException::OPTIONAL_SEGMENTS_ON_MIDDLE);
+			} else throw new BadRouteException(BadRouteException::UNCLOSED_OPTIONAL_SEGMENTS);
+		}
+	}
+
+	/**
+	 * @param string[] $segments
+	 *
+	 * @throws BadRouteException
+	 * @return array
+	 */
+
+	protected function buildSegments(array $segments)
+	{
+		$pattern  = "";
+		$patterns = [];
+		$wildcardTokens = [];
+		$wildcardRegex  = [];
+
+		foreach ($this->wildcards as $token => $regex) {
+			$wildcardTokens[] = ":$token";
+			$wildcardRegex [] = ":$regex";
+		}
+
+		foreach ($segments as $n => $segment) {
+			if ($segment === "" && $n !== 0) {
+				throw new BadRouteException(BadRouteException::EMPTY_OPTIONAL_PARTS);
+			}
+
+			$patterns[] = $pattern .= str_replace($wildcardTokens, $wildcardRegex, $segment);
+		}
+
+		return $patterns;
+	}
+
+	/**
+	 * @param string $method
+	 * @param string $pattern
+	 *
+	 * @return array|false
+	 */
+
+	public function findStaticRoute($method, $pattern)
+	{
+		$method = strtolower($method);
+		if (isset($this->statics[$method]) && isset($this->statics[$method][$pattern]))
+			return $this->statics[$method][$pattern];
+		return false;
+	}
+
+	/**
+	 * @param string $method
+	 * @param string $pattern
+	 *
+	 * @return array|false
+	 */
+
+	public function findDynamicRoutes($method, $pattern)
+	{
+		$index = $this->getDynamicIndex($method, $pattern);
+		return isset($this->dynamics[$index]) ? $this->dynamics[$index] : false;
+	}
+
+	/**
+	 * @param string $method
+	 * @param string $pattern
+	 *
+	 * @return int
+	 */
+
+	protected function getDynamicIndex($method, $pattern)
+	{
+		return crc32(strtolower($method)) + substr_count($pattern, "/");
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getWildcards()
+	{
+		return $this->wildcards;
+	}
+
+	/**
+	 * @param string $pattern
+	 * @param string $wildcard
+	 */
+
+	public function setWildcard($pattern, $wildcard)
+	{
+		$this->wildcards[$pattern] = $wildcard;
+	}
     
 }

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
      * @var array
      */
 
-    protected $statics  = [];
+    protected $statics = [];
 
     /**
      * The dynamic routes have parameters and are stored in a hashtable that every cell have
@@ -123,10 +123,10 @@ 
         return new Group($group);
     }
 
-    public function get   ($pattern, $action) { return $this->set("get"   , $pattern, $action); }
-    public function post  ($pattern, $action) { return $this->set("post"  , $pattern, $action); }
-    public function put   ($pattern, $action) { return $this->set("put"   , $pattern, $action); }
-    public function patch ($pattern, $action) { return $this->set("patch" , $pattern, $action); }
+    public function get($pattern, $action) { return $this->set("get", $pattern, $action); }
+    public function post($pattern, $action) { return $this->set("post", $pattern, $action); }
+    public function put($pattern, $action) { return $this->set("put", $pattern, $action); }
+    public function patch($pattern, $action) { return $this->set("patch", $pattern, $action); }
     public function delete($pattern, $action) { return $this->set("delete", $pattern, $action); }
 
     /**

Braces +18 added lines, -9 removed lines

@@ -117,7 +117,9 @@ 
             if (strpos($pattern, "{") !== false) {
                    $index = $this->getDynamicIndex($method, $pattern);
                    $this->dynamics[$index][$pattern] = $route;
-            } else $this->statics[$method][$pattern] = $route;
+            } else {
+            	$this->statics[$method][$pattern] = $route;
+            }
         }
 
         return new Group($group);
@@ -142,8 +144,9 @@ 
     public function match(array $methods, $pattern, $action)
     {
         $group = [];
-        foreach ($methods as $method)
-            $group[] = $this->set($method, $pattern, $action);
+        foreach ($methods as $method) {
+                    $group[] = $this->set($method, $pattern, $action);
+        }
         return new Group($group);
     }
 
@@ -186,8 +189,9 @@ 
     public function group(array $routes)
     {
         $group = [];
-        foreach ($routes as $route)
-            $group[] = $route;
+        foreach ($routes as $route) {
+                    $group[] = $route;
+        }
         return new Group($group);
     }
 
@@ -202,7 +206,9 @@ 
     {
         if (strpos($pattern, "{") === false) {
                unset($this->statics[$method][$pattern]);
-        } else unset($this->dynamics[$this->getDynamicIndex($method, $pattern)][$pattern]);
+        } else {
+        	unset($this->dynamics[$this->getDynamicIndex($method, $pattern)][$pattern]);
+        }
     }
 
     /**
@@ -257,7 +263,9 @@ 
         if ($closingNumber !== count($segments) - 1) {
             if (preg_match("~" . self::DYNAMIC_REGEX . "(*SKIP)(*F)|\]~x", $withoutClosing)) {
                    throw new BadRouteException(BadRouteException::OPTIONAL_SEGMENTS_ON_MIDDLE);
-            } else throw new BadRouteException(BadRouteException::UNCLOSED_OPTIONAL_SEGMENTS);
+            } else {
+            	throw new BadRouteException(BadRouteException::UNCLOSED_OPTIONAL_SEGMENTS);
+            }
         }
     }
 
@@ -301,8 +309,9 @@ 
     public function findStaticRoute($method, $pattern)
     {
         $method = strtolower($method);
-        if (isset($this->statics[$method]) && isset($this->statics[$method][$pattern]))
-            return $this->statics[$method][$pattern];
+        if (isset($this->statics[$method]) && isset($this->statics[$method][$pattern])) {
+                    return $this->statics[$method][$pattern];
+        }
         return false;
     }
 

src/Collectors/ResourceCollectorTrait.php

Indentation +97 added lines, -97 removed lines

@@ -22,102 +22,102 @@
 trait ResourceCollectorTrait
 {
 
-    abstract public function set($method, $pattern, $action);
-
-    /**
-     * A map of all routes of resources.
-     *
-     * @var array
-     */
-
-    protected $map = [
-        "index"  => ["get",    "/{name}"],
-        "make"   => ["get",    "/{name}/make"],
-        "create" => ["post",   "/{name}"],
-        "show"   => ["get",    "/{name}/{id:int+}"],
-        "edit"   => ["get",    "/{name}/{id:int+}/edit"],
-        "update" => ["put",    "/{name}/{id:int+}"],
-        "delete" => ["delete", "/{name}/{id:int+}"],
-    ];
-
-    /**
-     * Resource routing allows you to quickly declare all of the common routes for a given resourceful controller. 
-     * Instead of declaring separate routes for your index, show, new, edit, create, update and destroy actions, 
-     * a resourceful route declares them in a single line of code.
-     *
-     * @param string $controller The controller name.
-     * @param array  $options    Some options like, "as" to name the route pattern, "only" to
-     *                           explicit say that only this routes will be registered, and
-     *                           "except" that register all the routes except the indicates.
-     * @return Resource
-     */
-
-    public function resource($controller, array $options = array())
-    {
-        $name       = isset($options["prefix"]) ? $options["prefix"] : "";
-        $name      .= $this->getResourceName($controller, $options);
-        $actions    = $this->getResourceActions($options);
-        $resource = new Resource;
-
-        foreach ($actions as $action => $map) {
-            $resource->set($this->set($map[0], $this->getResourcePath($action, $map[1], $name, $options), [$controller, $action]));
-        }
-
-        return $resource;
-    }
-
-    /**
-     * Collect several resources at same time.
-     *
-     * @param array $controllers Several controller names as parameters or an array with all controller names.
-     * @return Resource
-     */
-
-    public function resources(array $controllers)
-    {
-        $resource = new Resource;
-        foreach ($controllers as $controller)
-            $resource->set($this->resource($controller));
-        return $resource;
-    }
-
-    /**
-     * @param string $controller
-     * @param array $options
-     *
-     * @return mixed
-     */
-
-    protected function getResourceName($controller, array $options)
-    {
-        return isset($options["as"]) ? $options["as"] : str_replace("controller", "", strtolower($controller));
-    }
-
-    /**
-     * @param  array $options
-     * @return array
-     */
-
-    protected function getResourceActions(array $options)
-    {
-        return isset($options["only"])   ? array_intersect_key($this->map, array_flip((array) $options["only"])) :
-              (isset($options["except"]) ? array_diff_key($this->map, array_flip((array) $options["except"]))    : $this->map);
-    }
-
-    /**
-     * @param string $action
-     * @param string $path
-     * @param string $name
-     * @param string[] $options
-     *
-     * @return string
-     */
-
-    protected function getResourcePath($action, $path, $name, array $options)
-    {
-        return str_replace("{name}", $name,
-            $action === "make" && isset($options["translate"]["make"]) ? str_replace("make", $options["translate"]["make"], $path) :
-           ($action === "edit" && isset($options["translate"]["edit"]) ? str_replace("edit", $options["translate"]["edit"], $path) : $path));
-    }
+	abstract public function set($method, $pattern, $action);
+
+	/**
+	 * A map of all routes of resources.
+	 *
+	 * @var array
+	 */
+
+	protected $map = [
+		"index"  => ["get",    "/{name}"],
+		"make"   => ["get",    "/{name}/make"],
+		"create" => ["post",   "/{name}"],
+		"show"   => ["get",    "/{name}/{id:int+}"],
+		"edit"   => ["get",    "/{name}/{id:int+}/edit"],
+		"update" => ["put",    "/{name}/{id:int+}"],
+		"delete" => ["delete", "/{name}/{id:int+}"],
+	];
+
+	/**
+	 * Resource routing allows you to quickly declare all of the common routes for a given resourceful controller. 
+	 * Instead of declaring separate routes for your index, show, new, edit, create, update and destroy actions, 
+	 * a resourceful route declares them in a single line of code.
+	 *
+	 * @param string $controller The controller name.
+	 * @param array  $options    Some options like, "as" to name the route pattern, "only" to
+	 *                           explicit say that only this routes will be registered, and
+	 *                           "except" that register all the routes except the indicates.
+	 * @return Resource
+	 */
+
+	public function resource($controller, array $options = array())
+	{
+		$name       = isset($options["prefix"]) ? $options["prefix"] : "";
+		$name      .= $this->getResourceName($controller, $options);
+		$actions    = $this->getResourceActions($options);
+		$resource = new Resource;
+
+		foreach ($actions as $action => $map) {
+			$resource->set($this->set($map[0], $this->getResourcePath($action, $map[1], $name, $options), [$controller, $action]));
+		}
+
+		return $resource;
+	}
+
+	/**
+	 * Collect several resources at same time.
+	 *
+	 * @param array $controllers Several controller names as parameters or an array with all controller names.
+	 * @return Resource
+	 */
+
+	public function resources(array $controllers)
+	{
+		$resource = new Resource;
+		foreach ($controllers as $controller)
+			$resource->set($this->resource($controller));
+		return $resource;
+	}
+
+	/**
+	 * @param string $controller
+	 * @param array $options
+	 *
+	 * @return mixed
+	 */
+
+	protected function getResourceName($controller, array $options)
+	{
+		return isset($options["as"]) ? $options["as"] : str_replace("controller", "", strtolower($controller));
+	}
+
+	/**
+	 * @param  array $options
+	 * @return array
+	 */
+
+	protected function getResourceActions(array $options)
+	{
+		return isset($options["only"])   ? array_intersect_key($this->map, array_flip((array) $options["only"])) :
+			  (isset($options["except"]) ? array_diff_key($this->map, array_flip((array) $options["except"]))    : $this->map);
+	}
+
+	/**
+	 * @param string $action
+	 * @param string $path
+	 * @param string $name
+	 * @param string[] $options
+	 *
+	 * @return string
+	 */
+
+	protected function getResourcePath($action, $path, $name, array $options)
+	{
+		return str_replace("{name}", $name,
+			$action === "make" && isset($options["translate"]["make"]) ? str_replace("make", $options["translate"]["make"], $path) :
+		   ($action === "edit" && isset($options["translate"]["edit"]) ? str_replace("edit", $options["translate"]["edit"], $path) : $path));
+	}
 
 }

Spacing +8 added lines, -10 removed lines

@@ -31,12 +31,12 @@ 
      */
 
     protected $map = [
-        "index"  => ["get",    "/{name}"],
-        "make"   => ["get",    "/{name}/make"],
-        "create" => ["post",   "/{name}"],
-        "show"   => ["get",    "/{name}/{id:int+}"],
-        "edit"   => ["get",    "/{name}/{id:int+}/edit"],
-        "update" => ["put",    "/{name}/{id:int+}"],
+        "index"  => ["get", "/{name}"],
+        "make"   => ["get", "/{name}/make"],
+        "create" => ["post", "/{name}"],
+        "show"   => ["get", "/{name}/{id:int+}"],
+        "edit"   => ["get", "/{name}/{id:int+}/edit"],
+        "update" => ["put", "/{name}/{id:int+}"],
         "delete" => ["delete", "/{name}/{id:int+}"],
     ];
 
@@ -100,8 +100,7 @@ 
 
     protected function getResourceActions(array $options)
     {
-        return isset($options["only"])   ? array_intersect_key($this->map, array_flip((array) $options["only"])) :
-              (isset($options["except"]) ? array_diff_key($this->map, array_flip((array) $options["except"]))    : $this->map);
+        return isset($options["only"]) ? array_intersect_key($this->map, array_flip((array) $options["only"])) : (isset($options["except"]) ? array_diff_key($this->map, array_flip((array) $options["except"])) : $this->map);
     }
 
     /**
@@ -116,8 +115,7 @@ 
     protected function getResourcePath($action, $path, $name, array $options)
     {
         return str_replace("{name}", $name,
-            $action === "make" && isset($options["translate"]["make"]) ? str_replace("make", $options["translate"]["make"], $path) :
-           ($action === "edit" && isset($options["translate"]["edit"]) ? str_replace("edit", $options["translate"]["edit"], $path) : $path));
+            $action === "make" && isset($options["translate"]["make"]) ? str_replace("make", $options["translate"]["make"], $path) : ($action === "edit" && isset($options["translate"]["edit"]) ? str_replace("edit", $options["translate"]["edit"], $path) : $path));
     }
 
 }

Braces +3 added lines, -2 removed lines

@@ -76,8 +76,9 @@
     public function resources(array $controllers)
     {
         $resource = new Resource;
-        foreach ($controllers as $controller)
-            $resource->set($this->resource($controller));
+        foreach ($controllers as $controller) {
+                    $resource->set($this->resource($controller));
+        }
         return $resource;
     }
 

src/Exceptions/BadDispatchStrategyException.php

Indentation +3 added lines, -3 removed lines

@@ -20,8 +20,8 @@
 class BadDispatchStrategyException extends BadRouteException
 {
 
-    public function __construct($strategy) {
-        parent::__construct("`$strategy` is not a valid route dispatch strategy, it must implement the `Codeburner\Router\DispatchStrategies\DispatchStrategyInterface` interface.");
-    }
+	public function __construct($strategy) {
+		parent::__construct("`$strategy` is not a valid route dispatch strategy, it must implement the `Codeburner\Router\DispatchStrategies\DispatchStrategyInterface` interface.");
+	}
     
 }

src/Exceptions/BadRouteException.php

Indentation +3 added lines, -3 removed lines

@@ -20,8 +20,8 @@
 class BadRouteException extends \Exception
 {
 
-    const OPTIONAL_SEGMENTS_ON_MIDDLE = "Optional segments can only occur at the end of a route.";
-    const UNCLOSED_OPTIONAL_SEGMENTS  = "Number of opening [ and closing ] does not match.";
-    const EMPTY_OPTIONAL_PARTS        = "Empty optional part.";
+	const OPTIONAL_SEGMENTS_ON_MIDDLE = "Optional segments can only occur at the end of a route.";
+	const UNCLOSED_OPTIONAL_SEGMENTS  = "Number of opening [ and closing ] does not match.";
+	const EMPTY_OPTIONAL_PARTS        = "Empty optional part.";
 
 }

src/Exceptions/MethodNotAllowedException.php

Indentation +55 added lines, -55 removed lines

@@ -20,71 +20,71 @@
 class MethodNotAllowedException extends BadRouteException
 {
 
-    /**
-     * The HTTP method from request.
-     *
-     * @var string
-     */
+	/**
+	 * The HTTP method from request.
+	 *
+	 * @var string
+	 */
 
-    public $requestedMethod;
+	public $requestedMethod;
 
-    /**
-     * The requested URi.
-     *
-     * @var string
-     */
+	/**
+	 * The requested URi.
+	 *
+	 * @var string
+	 */
 
-    public $requestedUri;
+	public $requestedUri;
 
-    /**
-     * All the allowed HTTP methods and routes for the request.
-     *
-     * @var array
-     */
+	/**
+	 * All the allowed HTTP methods and routes for the request.
+	 *
+	 * @var array
+	 */
 
-    public $allowedMethods;
+	public $allowedMethods;
 	
-    /**
-     * Exception constructor.
-     *
-     * @param string  $requestedMethod The request HTTP method.
-     * @param string  $requestedUri    The request URi.
-     * @param array   $allowedMethods  All the allowed HTTP methods and routes for the request.
-     * @param string  $message         The exception error message.
-     * @param integer $code            The exception error code.
-     */
+	/**
+	 * Exception constructor.
+	 *
+	 * @param string  $requestedMethod The request HTTP method.
+	 * @param string  $requestedUri    The request URi.
+	 * @param array   $allowedMethods  All the allowed HTTP methods and routes for the request.
+	 * @param string  $message         The exception error message.
+	 * @param integer $code            The exception error code.
+	 */
 
-    public function __construct($requestedMethod, $requestedUri, array $allowedMethods, $message = null, $code = 405)
-    {
-        $this->requestedMethod = $requestedMethod;
-        $this->requestedUri    = $requestedUri;
-        $this->allowedMethods  = $allowedMethods;
-        parent::__construct($message, $code);
-    }
+	public function __construct($requestedMethod, $requestedUri, array $allowedMethods, $message = null, $code = 405)
+	{
+		$this->requestedMethod = $requestedMethod;
+		$this->requestedUri    = $requestedUri;
+		$this->allowedMethods  = $allowedMethods;
+		parent::__construct($message, $code);
+	}
 
-    /**
-     * Verify if the given HTTP method is allowed for the request.
-     *
-     * @param string An HTTP method
-     * @return bool
-     */
+	/**
+	 * Verify if the given HTTP method is allowed for the request.
+	 *
+	 * @param string An HTTP method
+	 * @return bool
+	 */
 
-    public function can($method)
-    {
-        return isset($this->allowedMethods[strtoupper($method)]);
-    }
+	public function can($method)
+	{
+		return isset($this->allowedMethods[strtoupper($method)]);
+	}
 
-    /**
-     * The HTTP specification requires that a 405 Method Not Allowed response include the 
-     * Allow: header to detail available methods for the requested resource.
-     *
-     * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html section 14.7
-     * @return string
-     */
+	/**
+	 * The HTTP specification requires that a 405 Method Not Allowed response include the 
+	 * Allow: header to detail available methods for the requested resource.
+	 *
+	 * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html section 14.7
+	 * @return string
+	 */
     
-    public function allowed()
-    {
-        return implode(', ', array_keys($this->allowedMethods));
-    }
+	public function allowed()
+	{
+		return implode(', ', array_keys($this->allowedMethods));
+	}
 
 }

src/Exceptions/MethodNotSupportedException.php

Indentation +3 added lines, -3 removed lines

@@ -20,8 +20,8 @@
 class MethodNotSupportedException extends BadRouteException
 {
 
-    public function __construct($method) {
-        parent::__construct("The HTTP method '$method' is not supported by the route collector.");
-    }
+	public function __construct($method) {
+		parent::__construct("The HTTP method '$method' is not supported by the route collector.");
+	}
 
 }

src/Exceptions/NotFoundException.php

Indentation +27 added lines, -27 removed lines

@@ -19,36 +19,36 @@
 class NotFoundException extends \Exception
 {
 
-    /**
-     * The HTTP method from request.
-     *
-     * @var string
-     */
+	/**
+	 * The HTTP method from request.
+	 *
+	 * @var string
+	 */
 
-    public $requestedMethod;
+	public $requestedMethod;
 
-    /**
-     * The requested Path.
-     *
-     * @var string
-     */
+	/**
+	 * The requested Path.
+	 *
+	 * @var string
+	 */
 
-    public $requestedPath;
+	public $requestedPath;
     
-    /**
-     * Exception constructor.
-     *
-     * @param string  $requestedMethod  The request HTTP method.
-     * @param string  $requestedPath    The request Path.
-     * @param string  $message          The exception error message.
-     * @param integer $code             The exception error code.
-     */
-
-    public function __construct($requestedMethod, $requestedPath, $message = null, $code = 405)
-    {
-        $this->requestedMethod = $requestedMethod;
-        $this->requestedPath = $requestedPath;
-        parent::__construct($message, $code);
-    }
+	/**
+	 * Exception constructor.
+	 *
+	 * @param string  $requestedMethod  The request HTTP method.
+	 * @param string  $requestedPath    The request Path.
+	 * @param string  $message          The exception error message.
+	 * @param integer $code             The exception error code.
+	 */
+
+	public function __construct($requestedMethod, $requestedPath, $message = null, $code = 405)
+	{
+		$this->requestedMethod = $requestedMethod;
+		$this->requestedPath = $requestedPath;
+		parent::__construct($message, $code);
+	}
 	
 }