codeburnerframework / routing

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

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionParameter;
-use Reflector;
 
 /**
  * Methods for enable the collector to make routes from a controller.

Indentation +218 added lines, -218 removed lines

@@ -26,224 +26,224 @@
 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);
-                $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[] = $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 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[] = $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 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;
+	}
 
 }

Braces +9 added lines, -5 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);
     }
 
@@ -134,7 +136,9 @@ 
 
                 if ($strategy !== null) {
                        $route->setStrategy($strategy);
-                } else $route->setStrategy($controllerDefaultStrategy);
+                } else {
+                	$route->setStrategy($controllerDefaultStrategy);
+                }
 
                 $group[] = $route;
             }

src/Route.php

Doc Comments +1 added lines, -1 removed lines

@@ -526,7 +526,7 @@
 
     /**
      * @param string $key
-     * @param mixed $value
+     * @param string $value
      *
      * @return $this
      */

Indentation +573 added lines, -573 removed lines

@@ -23,586 +23,586 @@
 class Route
 {
 
-    /**
-     * @var Collector
-     */
+	/**
+	 * @var Collector
+	 */
 
-    protected $collector;
+	protected $collector;
     
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
 
-    protected $method;
+	protected $method;
     
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
 
-    protected $pattern;
+	protected $pattern;
     
-    /**
-     * @var string|array|\Closure
-     */
+	/**
+	 * @var string|array|\Closure
+	 */
 
-    protected $action;
+	protected $action;
     
-    /**
-     * @var string
-     */
-
-    protected $namespace = "";
-
-    /**
-     * @var string[]
-     */
-
-    protected $params = [];
-
-    /**
-     * Defaults are parameters set by the user, and don't
-     * appear on the pattern.
-     *
-     * @var array
-     */
-
-    protected $defaults = [];
-
-    /**
-     * Metadata can be set to be used on filters, dispatch strategies
-     * or anywhere the route object is used.
-     *
-     * @var array
-     */
-
-    protected $metadata = [];
-
-    /**
-     * @var null|string|StrategyInterface
-     */
-
-    protected $strategy;
-
-    /**
-     * Blocked routes are dynamic routes selected to pass by the matcher.
-     *
-     * @var boolean
-     */
-
-    protected $blocked = false;
-
-    /**
-     * The matcher that dispatched this route.
-     *
-     * @var Matcher $matcher
-     */
-
-    protected $matcher;
-
-    /**
-     * The function used to create controllers from name.
-     *
-     * @var null|string|array|\Closure
-     */
-
-    protected $controllerCreationFunction;
-
-    /**
-     * @param Collector $collector
-     * @param string $method
-     * @param string $pattern
-     * @param string|array|\Closure $action
-     */
-
-    public function __construct(Collector $collector, $method, $pattern, $action)
-    {
-        $this->collector = $collector;
-        $this->method    = $method;
-        $this->pattern   = $pattern;
-        $this->action    = $action;
-    }
-
-    /**
-     * Clone this route and set it into the collector.
-     *
-     * @return Route
-     */
-
-    public function reset()
-    {
-        return $this->collector->set($this->method, $this->pattern, $this->action)->nth(0)
-                               ->setStrategy($this->strategy)->setParams($this->params)
-                               ->setDefaults($this->defaults)->setMetadataArray($this->metadata);
-    }
-
-    /**
-     * Remove this route from the collector.
-     *
-     * @return self
-     */
-
-    public function forget()
-    {
-        $this->collector->forget($this->method, $this->pattern);
-        return $this;
-    }
-
-    /**
-     * Blocking a route indicate that that route have been selected and
-     * parsed, now it will be given to the matcher.
-     *
-     * @return self
-     */
-
-    public function block()
-    {
-        $this->blocked = true;
-        return $this;
-    }
-
-    /**
-     * Verify if a Route have already been blocked.
-     *
-     * @return boolean
-     */
-
-    public function blocked()
-    {
-        return $this->blocked;
-    }
-
-    /**
-     * Execute the route action, if no strategy was provided the action
-     * will be executed by the call_user_func PHP function.
-     *
-     * @throws BadRouteException
-     * @return mixed
-     */
-
-    public function call()
-    {
-        $this->action = $this->parseCallable($this->action);
-
-        if ($this->strategy === null) {
-            return call_user_func_array($this->action, array_merge($this->defaults, $this->params));
-        }
-
-        if (!is_object($this->strategy)) {
-            $this->strategy = new $this->strategy;
-        }
-
-        return $this->callWithStrategy();
-    }
-
-    /**
-     * Seek for dynamic content on callables. eg. routes action controller#action
-     * syntax allow to use the variables to build the string like: {controller}@{action}
-     *
-     * @param string|array|\Closure $callable
-     * @return string|array|\Closure
-     */
-
-    private function parseCallable($callable)
-    {
-        if (is_string($callable) && strpos($callable, "@")) {
-            $callable = explode("@", $callable);
-        }
-
-        if (is_array($callable)) {
-            if (is_string($callable[0])) {
-                   $callable[0] = $this->parseCallableController($callable[0]);
-                   $callable[1] = $this->parseCallablePlaceholders($callable[1]);
-            } else $callable[1] = $this->parseCallablePlaceholders($callable[1]);
-        }
-
-        return $callable;
-    }
-
-    /**
-     * Get the controller object.
-     *
-     * @param string $controller
-     * @return Object
-     */
-
-    private function parseCallableController($controller)
-    {
-        $controller  = rtrim($this->namespace, "\\") . "\\" . $this->parseCallablePlaceholders($controller);
-
-        if ($this->controllerCreationFunction === null) {
-               return new $controller;
-        } else return call_user_func($this->controllerCreationFunction, $controller);
-    }
-
-    /**
-     * Parse and replace dynamic content on route action.
-     *
-     * @param  string $fragment Part of callable
-     * @return string
-     */
-
-    private function parseCallablePlaceholders($fragment)
-    {
-        if (strpos($fragment, "{") !== false) {
-            foreach ($this->params as $placeholder => $value) {
-                if (strpos($fragment, "{" . $placeholder . "}") !== false) {
-                    $fragment = str_replace("{" . $placeholder . "}", ucwords(str_replace("-", " ", $value)), $fragment);
-                }
-            }
-        }
-
-        return $fragment;
-    }
-
-    /**
-     * Execute the route action with the given strategy.
-     *
-     * @throws BadRouteException
-     * @return mixed
-     */
-
-    private function callWithStrategy()
-    {
-        if ($this->strategy instanceof StrategyInterface) {
-            if ($this->strategy instanceof MatcherAwareInterface) {
-                $this->strategy->setMatcher($this->matcher);
-            }
-
-            return $this->strategy->call($this);
-        }
-
-        throw new BadRouteException("`$this->strategy` is not a valid route dispatch strategy, ".
-            "it must implement the `Codeburner\Router\Strategies\StrategyInterface` interface.");
-    }
-
-    /**
-     * @return Collector
-     */
-
-    public function getCollector()
-    {
-        return $this->collector;
-    }
-
-    /**
-     * @return string
-     */
-
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * @return string
-     */
-
-    public function getPattern()
-    {
-        return $this->pattern;
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getSegments()
-    {
-        return explode("/", $this->pattern);
-    }
-
-    /**
-     * @return string|array|\Closure
-     */
-
-    public function getAction()
-    {
-        return $this->action;
-    }
-
-    /**
-     * @return string
-     */
-
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getParams()
-    {
-        return $this->params;
-    }
-
-    /**
-     * @param string $key
-     * @return string
-     */
-
-    public function getParam($key)
-    {
-        return $this->params[$key];
-    }
-
-    /**
-     * @return array
-     */
-
-    public function getDefaults()
-    {
-        return $this->defaults;
-    }
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-
-    public function getDefault($key)
-    {
-        return $this->defaults[$key];
-    }
-
-    /**
-     * @return array
-     */
-
-    public function getMetadataArray()
-    {
-        return $this->metadata;
-    }
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-
-    public function getMetadata($key)
-    {
-        return $this->metadata[$key];
-    }
-
-    /**
-     * @return string|null
-     */
-
-    public function getStrategy()
-    {
-        if ($this->strategy instanceof StrategyInterface) {
-            return get_class($this->strategy);
-        }
-
-        return $this->strategy;
-    }
-
-    /**
-     * @inheritdoc
-     */
-
-    public function getMatcher()
-    {
-        return $this->matcher;
-    }
-
-    /**
-     * @param string $method
-     * @return Route
-     */
-
-    public function setMethod($method)
-    {
-        $this->forget();
-        $this->method = $method;
-        return $this->reset();
-    }
-
-    /**
-     * @param string $pattern
-     * @return Route
-     */
-
-    public function setPattern($pattern)
-    {
-        $this->forget();
-        $this->pattern = $pattern;
-        return $this->reset();
-    }
-
-    /**
-     * @param string $pattern
-     * @return self
-     */
-
-    public function setPatternWithoutReset($pattern)
-    {
-        $this->pattern = $pattern;
-        return $this;
-    }
-
-    /**
-     * @param string $action
-     * @return self
-     */
-
-    public function setAction($action)
-    {
-        $this->action = $action;
-        return $this;
-    }
-
-    /**
-     * @param string $namespace
-     * @return self
-     */
-
-    public function setNamespace($namespace)
-    {
-        $this->namespace = $namespace;
-        return $this;
-    }
-
-    /**
-     * @param string[] $params
-     * @return self
-     */
-
-    public function setParams(array $params)
-    {
-        $this->params = $params;
-        return $this;
-    }
-
-    /**
-     * @param string $key
-     * @param string $value
-     *
-     * @return self
-     */
-
-    public function setParam($key, $value)
-    {
-        $this->params[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * @param mixed[] $defaults
-     * @return self
-     */
-
-    public function setDefaults(array $defaults)
-    {
-        $this->defaults = $defaults;
-        return $this;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed $value
-     *
-     * @return self
-     */
-
-    public function setDefault($key, $value)
-    {
-        $this->defaults[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * @param mixed[] $metadata
-     * @return self
-     */
-
-    public function setMetadataArray(array $metadata)
-    {
-        $this->metadata = $metadata;
-        return $this;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed $value
-     *
-     * @return $this
-     */
-
-    public function setMetadata($key, $value)
-    {
-        $this->metadata[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * @param string|StrategyInterface $strategy
-     * @return self
-     */
-
-    public function setStrategy($strategy)
-    {
-        $this->strategy = $strategy;
-        return $this;
-    }
-
-    /**
-     * @inheritdoc
-     */
-
-    public function setMatcher(Matcher $matcher)
-    {
-        $this->matcher = $matcher;
-    }
-
-    /**
-     * Set a function to create controllers.
-     *
-     * @param string|array|\Closure $callable
-     * @throws BadRouteException
-     * @return self
-     */
-
-    public function setControllerCreationFunction($callable)
-    {
-        if (!is_callable($callable)) {
-            throw new BadRouteException(BadRouteException::WRONG_CONTROLLER_CREATION_FUNC);
-        }
-
-        $this->controllerCreationFunction = $this->parseCallable($callable);
-        return $this;
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-
-    public function hasParam($key)
-    {
-        return isset($this->params[$key]);
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-
-    public function hasDefault($key)
-    {
-        return isset($this->defaults[$key]);
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-
-    public function hasMetadata($key)
-    {
-        return isset($this->metadata[$key]);
-    }
+	/**
+	 * @var string
+	 */
+
+	protected $namespace = "";
+
+	/**
+	 * @var string[]
+	 */
+
+	protected $params = [];
+
+	/**
+	 * Defaults are parameters set by the user, and don't
+	 * appear on the pattern.
+	 *
+	 * @var array
+	 */
+
+	protected $defaults = [];
+
+	/**
+	 * Metadata can be set to be used on filters, dispatch strategies
+	 * or anywhere the route object is used.
+	 *
+	 * @var array
+	 */
+
+	protected $metadata = [];
+
+	/**
+	 * @var null|string|StrategyInterface
+	 */
+
+	protected $strategy;
+
+	/**
+	 * Blocked routes are dynamic routes selected to pass by the matcher.
+	 *
+	 * @var boolean
+	 */
+
+	protected $blocked = false;
+
+	/**
+	 * The matcher that dispatched this route.
+	 *
+	 * @var Matcher $matcher
+	 */
+
+	protected $matcher;
+
+	/**
+	 * The function used to create controllers from name.
+	 *
+	 * @var null|string|array|\Closure
+	 */
+
+	protected $controllerCreationFunction;
+
+	/**
+	 * @param Collector $collector
+	 * @param string $method
+	 * @param string $pattern
+	 * @param string|array|\Closure $action
+	 */
+
+	public function __construct(Collector $collector, $method, $pattern, $action)
+	{
+		$this->collector = $collector;
+		$this->method    = $method;
+		$this->pattern   = $pattern;
+		$this->action    = $action;
+	}
+
+	/**
+	 * Clone this route and set it into the collector.
+	 *
+	 * @return Route
+	 */
+
+	public function reset()
+	{
+		return $this->collector->set($this->method, $this->pattern, $this->action)->nth(0)
+							   ->setStrategy($this->strategy)->setParams($this->params)
+							   ->setDefaults($this->defaults)->setMetadataArray($this->metadata);
+	}
+
+	/**
+	 * Remove this route from the collector.
+	 *
+	 * @return self
+	 */
+
+	public function forget()
+	{
+		$this->collector->forget($this->method, $this->pattern);
+		return $this;
+	}
+
+	/**
+	 * Blocking a route indicate that that route have been selected and
+	 * parsed, now it will be given to the matcher.
+	 *
+	 * @return self
+	 */
+
+	public function block()
+	{
+		$this->blocked = true;
+		return $this;
+	}
+
+	/**
+	 * Verify if a Route have already been blocked.
+	 *
+	 * @return boolean
+	 */
+
+	public function blocked()
+	{
+		return $this->blocked;
+	}
+
+	/**
+	 * Execute the route action, if no strategy was provided the action
+	 * will be executed by the call_user_func PHP function.
+	 *
+	 * @throws BadRouteException
+	 * @return mixed
+	 */
+
+	public function call()
+	{
+		$this->action = $this->parseCallable($this->action);
+
+		if ($this->strategy === null) {
+			return call_user_func_array($this->action, array_merge($this->defaults, $this->params));
+		}
+
+		if (!is_object($this->strategy)) {
+			$this->strategy = new $this->strategy;
+		}
+
+		return $this->callWithStrategy();
+	}
+
+	/**
+	 * Seek for dynamic content on callables. eg. routes action controller#action
+	 * syntax allow to use the variables to build the string like: {controller}@{action}
+	 *
+	 * @param string|array|\Closure $callable
+	 * @return string|array|\Closure
+	 */
+
+	private function parseCallable($callable)
+	{
+		if (is_string($callable) && strpos($callable, "@")) {
+			$callable = explode("@", $callable);
+		}
+
+		if (is_array($callable)) {
+			if (is_string($callable[0])) {
+				   $callable[0] = $this->parseCallableController($callable[0]);
+				   $callable[1] = $this->parseCallablePlaceholders($callable[1]);
+			} else $callable[1] = $this->parseCallablePlaceholders($callable[1]);
+		}
+
+		return $callable;
+	}
+
+	/**
+	 * Get the controller object.
+	 *
+	 * @param string $controller
+	 * @return Object
+	 */
+
+	private function parseCallableController($controller)
+	{
+		$controller  = rtrim($this->namespace, "\\") . "\\" . $this->parseCallablePlaceholders($controller);
+
+		if ($this->controllerCreationFunction === null) {
+			   return new $controller;
+		} else return call_user_func($this->controllerCreationFunction, $controller);
+	}
+
+	/**
+	 * Parse and replace dynamic content on route action.
+	 *
+	 * @param  string $fragment Part of callable
+	 * @return string
+	 */
+
+	private function parseCallablePlaceholders($fragment)
+	{
+		if (strpos($fragment, "{") !== false) {
+			foreach ($this->params as $placeholder => $value) {
+				if (strpos($fragment, "{" . $placeholder . "}") !== false) {
+					$fragment = str_replace("{" . $placeholder . "}", ucwords(str_replace("-", " ", $value)), $fragment);
+				}
+			}
+		}
+
+		return $fragment;
+	}
+
+	/**
+	 * Execute the route action with the given strategy.
+	 *
+	 * @throws BadRouteException
+	 * @return mixed
+	 */
+
+	private function callWithStrategy()
+	{
+		if ($this->strategy instanceof StrategyInterface) {
+			if ($this->strategy instanceof MatcherAwareInterface) {
+				$this->strategy->setMatcher($this->matcher);
+			}
+
+			return $this->strategy->call($this);
+		}
+
+		throw new BadRouteException("`$this->strategy` is not a valid route dispatch strategy, ".
+			"it must implement the `Codeburner\Router\Strategies\StrategyInterface` interface.");
+	}
+
+	/**
+	 * @return Collector
+	 */
+
+	public function getCollector()
+	{
+		return $this->collector;
+	}
+
+	/**
+	 * @return string
+	 */
+
+	public function getMethod()
+	{
+		return $this->method;
+	}
+
+	/**
+	 * @return string
+	 */
+
+	public function getPattern()
+	{
+		return $this->pattern;
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getSegments()
+	{
+		return explode("/", $this->pattern);
+	}
+
+	/**
+	 * @return string|array|\Closure
+	 */
+
+	public function getAction()
+	{
+		return $this->action;
+	}
+
+	/**
+	 * @return string
+	 */
+
+	public function getNamespace()
+	{
+		return $this->namespace;
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getParams()
+	{
+		return $this->params;
+	}
+
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+
+	public function getParam($key)
+	{
+		return $this->params[$key];
+	}
+
+	/**
+	 * @return array
+	 */
+
+	public function getDefaults()
+	{
+		return $this->defaults;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+
+	public function getDefault($key)
+	{
+		return $this->defaults[$key];
+	}
+
+	/**
+	 * @return array
+	 */
+
+	public function getMetadataArray()
+	{
+		return $this->metadata;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+
+	public function getMetadata($key)
+	{
+		return $this->metadata[$key];
+	}
+
+	/**
+	 * @return string|null
+	 */
+
+	public function getStrategy()
+	{
+		if ($this->strategy instanceof StrategyInterface) {
+			return get_class($this->strategy);
+		}
+
+		return $this->strategy;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+
+	public function getMatcher()
+	{
+		return $this->matcher;
+	}
+
+	/**
+	 * @param string $method
+	 * @return Route
+	 */
+
+	public function setMethod($method)
+	{
+		$this->forget();
+		$this->method = $method;
+		return $this->reset();
+	}
+
+	/**
+	 * @param string $pattern
+	 * @return Route
+	 */
+
+	public function setPattern($pattern)
+	{
+		$this->forget();
+		$this->pattern = $pattern;
+		return $this->reset();
+	}
+
+	/**
+	 * @param string $pattern
+	 * @return self
+	 */
+
+	public function setPatternWithoutReset($pattern)
+	{
+		$this->pattern = $pattern;
+		return $this;
+	}
+
+	/**
+	 * @param string $action
+	 * @return self
+	 */
+
+	public function setAction($action)
+	{
+		$this->action = $action;
+		return $this;
+	}
+
+	/**
+	 * @param string $namespace
+	 * @return self
+	 */
+
+	public function setNamespace($namespace)
+	{
+		$this->namespace = $namespace;
+		return $this;
+	}
+
+	/**
+	 * @param string[] $params
+	 * @return self
+	 */
+
+	public function setParams(array $params)
+	{
+		$this->params = $params;
+		return $this;
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $value
+	 *
+	 * @return self
+	 */
+
+	public function setParam($key, $value)
+	{
+		$this->params[$key] = $value;
+		return $this;
+	}
+
+	/**
+	 * @param mixed[] $defaults
+	 * @return self
+	 */
+
+	public function setDefaults(array $defaults)
+	{
+		$this->defaults = $defaults;
+		return $this;
+	}
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 *
+	 * @return self
+	 */
+
+	public function setDefault($key, $value)
+	{
+		$this->defaults[$key] = $value;
+		return $this;
+	}
+
+	/**
+	 * @param mixed[] $metadata
+	 * @return self
+	 */
+
+	public function setMetadataArray(array $metadata)
+	{
+		$this->metadata = $metadata;
+		return $this;
+	}
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 *
+	 * @return $this
+	 */
+
+	public function setMetadata($key, $value)
+	{
+		$this->metadata[$key] = $value;
+		return $this;
+	}
+
+	/**
+	 * @param string|StrategyInterface $strategy
+	 * @return self
+	 */
+
+	public function setStrategy($strategy)
+	{
+		$this->strategy = $strategy;
+		return $this;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+
+	public function setMatcher(Matcher $matcher)
+	{
+		$this->matcher = $matcher;
+	}
+
+	/**
+	 * Set a function to create controllers.
+	 *
+	 * @param string|array|\Closure $callable
+	 * @throws BadRouteException
+	 * @return self
+	 */
+
+	public function setControllerCreationFunction($callable)
+	{
+		if (!is_callable($callable)) {
+			throw new BadRouteException(BadRouteException::WRONG_CONTROLLER_CREATION_FUNC);
+		}
+
+		$this->controllerCreationFunction = $this->parseCallable($callable);
+		return $this;
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+
+	public function hasParam($key)
+	{
+		return isset($this->params[$key]);
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+
+	public function hasDefault($key)
+	{
+		return isset($this->defaults[$key]);
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+
+	public function hasMetadata($key)
+	{
+		return isset($this->metadata[$key]);
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -227,7 +227,7 @@ 
 
     private function parseCallableController($controller)
     {
-        $controller  = rtrim($this->namespace, "\\") . "\\" . $this->parseCallablePlaceholders($controller);
+        $controller = rtrim($this->namespace, "\\") . "\\" . $this->parseCallablePlaceholders($controller);
 
         if ($this->controllerCreationFunction === null) {
                return new $controller;
@@ -271,7 +271,7 @@ 
             return $this->strategy->call($this);
         }
 
-        throw new BadRouteException("`$this->strategy` is not a valid route dispatch strategy, ".
+        throw new BadRouteException("`$this->strategy` is not a valid route dispatch strategy, " .
             "it must implement the `Codeburner\Router\Strategies\StrategyInterface` interface.");
     }
 

Braces +6 added lines, -2 removed lines

@@ -212,7 +212,9 @@ 
             if (is_string($callable[0])) {
                    $callable[0] = $this->parseCallableController($callable[0]);
                    $callable[1] = $this->parseCallablePlaceholders($callable[1]);
-            } else $callable[1] = $this->parseCallablePlaceholders($callable[1]);
+            } else {
+            	$callable[1] = $this->parseCallablePlaceholders($callable[1]);
+            }
         }
 
         return $callable;
@@ -231,7 +233,9 @@ 
 
         if ($this->controllerCreationFunction === null) {
                return new $controller;
-        } else return call_user_func($this->controllerCreationFunction, $controller);
+        } else {
+        	return call_user_func($this->controllerCreationFunction, $controller);
+        }
     }
 
     /**

src/Exceptions/BadRouteException.php

Indentation +4 added lines, -4 removed lines

@@ -20,9 +20,9 @@
 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 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.";
 
 }