codeburnerframework / routing

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

src/Strategies/EnhancerAbstractStrategy.php

Indentation +32 added lines, -32 removed lines

@@ -24,37 +24,37 @@
 abstract class EnhancerAbstractStrategy implements StrategyInterface
 {
 
-    /**
-     * Key used to store the real route strategy on metadata.
-     *
-     * @var string
-     */
-
-    protected $metadataStrategyKey = "strategy";
-
-    /**
-     * @inheritdoc
-     * @throws BadRouteException
-     */
-
-    public function call(Route $route)
-    {
-        if ($route->hasMetadata($this->metadataStrategyKey)) {
-               $route->setStrategy($route->getMetadata($this->metadataStrategyKey));
-        } else $route->setStrategy(null);
-
-        $this->enhance($route);
-
-        return $route->call();
-    }
-
-    /**
-     * Manipulate route object before the dispatch.
-     *
-     * @param Route $route
-     * @return mixed
-     */
-
-    abstract public function enhance(Route $route);
+	/**
+	 * Key used to store the real route strategy on metadata.
+	 *
+	 * @var string
+	 */
+
+	protected $metadataStrategyKey = "strategy";
+
+	/**
+	 * @inheritdoc
+	 * @throws BadRouteException
+	 */
+
+	public function call(Route $route)
+	{
+		if ($route->hasMetadata($this->metadataStrategyKey)) {
+			   $route->setStrategy($route->getMetadata($this->metadataStrategyKey));
+		} else $route->setStrategy(null);
+
+		$this->enhance($route);
+
+		return $route->call();
+	}
+
+	/**
+	 * Manipulate route object before the dispatch.
+	 *
+	 * @param Route $route
+	 * @return mixed
+	 */
+
+	abstract public function enhance(Route $route);
 
 }

src/Strategies/MatcherAwareInterface.php

Indentation +8 added lines, -8 removed lines

@@ -20,16 +20,16 @@
 interface MatcherAwareInterface
 {
 
-    /**
-     * @param \Codeburner\Router\Matcher $matcher
-     */
+	/**
+	 * @param \Codeburner\Router\Matcher $matcher
+	 */
 
-    public function setMatcher(\Codeburner\Router\Matcher $matcher);
+	public function setMatcher(\Codeburner\Router\Matcher $matcher);
 
-    /**
-     * @return \Codeburner\Router\Matcher
-     */
+	/**
+	 * @return \Codeburner\Router\Matcher
+	 */
 
-    public function getMatcher();
+	public function getMatcher();
 
 }
\ No newline at end of file

src/Strategies/StrategyInterface.php

Indentation +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@
 interface StrategyInterface
 {
 
-    /**
-     * Dispatch the matched route action.
-     *
-     * @param \Codeburner\Router\Route $route
-     * @return mixed The response of request.
-     */
+	/**
+	 * Dispatch the matched route action.
+	 *
+	 * @param \Codeburner\Router\Route $route
+	 * @return mixed The response of request.
+	 */
 
-    public function call(\Codeburner\Router\Route $route);
+	public function call(\Codeburner\Router\Route $route);
 
 }

src/Collectors/ControllerCollectorTrait.php

Indentation +217 added lines, -217 removed lines

@@ -26,223 +26,223 @@
 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 = new Group;
-        foreach ($controllers as $controller)
-            $group->set($this->controller($controller));
-        return $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 = new Group;
-        foreach ($controllers as $controller)
-            $group->set($this->controllerWithoutPrefix($controller));
-        return $group;
-    }
-
-    /**
-     * @param ReflectionClass $controller
-     * @param ReflectionMethod[] $methods
-     * @param string $prefix
-     *
-     * @return Group
-     */
-
-    protected function collectControllerRoutes(ReflectionClass $controller, array $methods, $prefix)
-    {
-        $group = new Group;
-        $controllerDefaultStrategy = $this->getAnnotatedStrategy($controller);
-
-        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 = new Group;
+		foreach ($controllers as $controller)
+			$group->set($this->controller($controller));
+		return $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 = new Group;
+		foreach ($controllers as $controller)
+			$group->set($this->controllerWithoutPrefix($controller));
+		return $group;
+	}
+
+	/**
+	 * @param ReflectionClass $controller
+	 * @param ReflectionMethod[] $methods
+	 * @param string $prefix
+	 *
+	 * @return Group
+	 */
+
+	protected function collectControllerRoutes(ReflectionClass $controller, array $methods, $prefix)
+	{
+		$group = new Group;
+		$controllerDefaultStrategy = $this->getAnnotatedStrategy($controller);
+
+		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);
-                $strategy = $this->getAnnotatedStrategy($method);
-
-                /** @var \Codeburner\Router\Route $route */
-                $route = $this->set($http, "$action$dynamic", [$controller->name, $method->name]);
-
-                if ($strategy !== null) {
-                       $route->setStrategy($strategy);
-                } else $route->setStrategy($controllerDefaultStrategy);
-
-                $group->set($route);
-            }
-        }
-
-        return $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 ReflectionClass|ReflectionMethod $reflector
-     * @return string|null
-     */
-
-    protected function getAnnotatedStrategy($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);
+				$strategy = $this->getAnnotatedStrategy($method);
+
+				/** @var \Codeburner\Router\Route $route */
+				$route = $this->set($http, "$action$dynamic", [$controller->name, $method->name]);
+
+				if ($strategy !== null) {
+					   $route->setStrategy($strategy);
+				} else $route->setStrategy($controllerDefaultStrategy);
+
+				$group->set($route);
+			}
+		}
+
+		return $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 ReflectionClass|ReflectionMethod $reflector
+	 * @return string|null
+	 */
+
+	protected function getAnnotatedStrategy($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;
+	}
 
 }

src/Collector.php

Indentation +336 added lines, -336 removed lines

@@ -33,341 +33,341 @@
 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. ps. all keys and values must start with :
-     *
-     * @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    = new Group;
-
-        foreach ($patterns as $pattern)
-        {
-            $route = new Route($this, $method, $pattern, $action);
-            $group->setRoute($route);
-
-            if (strpos($pattern, "{") !== false) {
-                   $index = $this->getDynamicIndex($method, $pattern);
-                   $this->dynamics[$index][$pattern] = $route;
-            } else $this->statics[$method][$pattern] = $route;
-        }
-
-        return $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 = new Group;
-        foreach ($methods as $method)
-            $group->set($this->set($method, $pattern, $action));
-        return $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($methods, $pattern, $action)
-    {
-        return $this->match(array_diff(explode(" ", self::HTTP_METHODS), (array) $methods), $pattern, $action);
-    }
-
-    /**
-     * Group all given routes.
-     *
-     * @param Route[] $routes
-     * @return Group
-     */
-
-    public function group(array $routes)
-    {
-        $group = new Group;
-        foreach ($routes as $route)
-            $group->set($route);
-        return $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 = array_keys($this->wildcards);
-        $wildcardRegex  = $this->wildcards;
-
-        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 Route|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()
-    {
-        $wildcards = [];
-        foreach ($this->wildcards as $token => $regex)
-            $wildcards[substr($token, 1)] = substr($regex, 1);
-        return $wildcards;
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getWildcardTokens()
-    {
-        return $this->wildcards;
-    }
-
-    /**
-     * @param string $wildcard
-     * @return string|null
-     */
-
-    public function getWildcard($wildcard)
-    {
-        return isset($this->wildcards[":$wildcard"]) ? substr($this->wildcards[":$wildcard"], 1) : null;
-    }
-
-    /**
-     * @param string $wildcard
-     * @param string $pattern
-     *
-     * @return self
-     */
-
-    public function setWildcard($wildcard, $pattern)
-    {
-        $this->wildcards[":$wildcard"] = ":$pattern";
-        return $this;
-    }
+	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. ps. all keys and values must start with :
+	 *
+	 * @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    = new Group;
+
+		foreach ($patterns as $pattern)
+		{
+			$route = new Route($this, $method, $pattern, $action);
+			$group->setRoute($route);
+
+			if (strpos($pattern, "{") !== false) {
+				   $index = $this->getDynamicIndex($method, $pattern);
+				   $this->dynamics[$index][$pattern] = $route;
+			} else $this->statics[$method][$pattern] = $route;
+		}
+
+		return $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 = new Group;
+		foreach ($methods as $method)
+			$group->set($this->set($method, $pattern, $action));
+		return $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($methods, $pattern, $action)
+	{
+		return $this->match(array_diff(explode(" ", self::HTTP_METHODS), (array) $methods), $pattern, $action);
+	}
+
+	/**
+	 * Group all given routes.
+	 *
+	 * @param Route[] $routes
+	 * @return Group
+	 */
+
+	public function group(array $routes)
+	{
+		$group = new Group;
+		foreach ($routes as $route)
+			$group->set($route);
+		return $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 = array_keys($this->wildcards);
+		$wildcardRegex  = $this->wildcards;
+
+		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 Route|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()
+	{
+		$wildcards = [];
+		foreach ($this->wildcards as $token => $regex)
+			$wildcards[substr($token, 1)] = substr($regex, 1);
+		return $wildcards;
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getWildcardTokens()
+	{
+		return $this->wildcards;
+	}
+
+	/**
+	 * @param string $wildcard
+	 * @return string|null
+	 */
+
+	public function getWildcard($wildcard)
+	{
+		return isset($this->wildcards[":$wildcard"]) ? substr($this->wildcards[":$wildcard"], 1) : null;
+	}
+
+	/**
+	 * @param string $wildcard
+	 * @param string $pattern
+	 *
+	 * @return self
+	 */
+
+	public function setWildcard($wildcard, $pattern)
+	{
+		$this->wildcards[":$wildcard"] = ":$pattern";
+		return $this;
+	}
     
 }

src/Exceptions/BadRouteException.php

Indentation +5 added lines, -5 removed lines

@@ -19,10 +19,10 @@
 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 WRONG_CONTROLLER_CREATION_FUNC = "The controller creation function passed is not callable.";
-    const BAD_STRATEGY                   = "`%s` is not a valid route dispatch strategy, it must implement the `Codeburner\\Router\\Strategies\\StrategyInterface` interface.";
+	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 WRONG_CONTROLLER_CREATION_FUNC = "The controller creation function passed is not callable.";
+	const BAD_STRATEGY                   = "`%s` is not a valid route dispatch strategy, it must implement the `Codeburner\\Router\\Strategies\\StrategyInterface` interface.";
 
 }

src/Exceptions/Http/BadRequestException.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@
 class BadRequestException extends HttpExceptionAbstract
 {
 
-    protected $code = 400;
-    protected $message = "Bad Request";
+	protected $code = 400;
+	protected $message = "Bad Request";
 
 }

src/Exceptions/Http/ConflictException.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@
 class ConflictException extends HttpExceptionAbstract
 {
 
-    protected $code = 409;
-    protected $message = "Conflict";
+	protected $code = 409;
+	protected $message = "Conflict";
 
 }