codeburnerframework / routing

src/Collector.php

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); }
 
     /**

Indentation +290 added lines, -290 removed lines

@@ -20,7 +20,7 @@ 
  */
 
 if (!class_exists(Parser::class, false)) {
-    include __DIR__ . "/Parser.php";
+	include __DIR__ . "/Parser.php";
 }
 
 include __DIR__ . "/Route.php";
@@ -37,294 +37,294 @@ 
 class Collector
 {
 
-    use Collectors\ControllerCollectorTrait;
-    use Collectors\ResourceCollectorTrait;
-
-
-    /**
-     * 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 = [];
-
-    /**
-     * The pattern parser instance.
-     *
-     * @var Parser
-     */
-
-    protected $parser;
-
-    /**
-     * Collector constructor.
-     *
-     * @param Parser|null $parser
-     */
-
-    public function __construct(Parser $parser = null)
-    {
-        $this->parser = $parser ?: new Parser;
-    }
-
-    /**
-     * @param string $method
-     * @param string $pattern
-     * @param callable $action
-     *
-     * @throws BadRouteException 
-     * @throws MethodNotSupportedException
-     *
-     * @return Group
-     */
-
-    public function set($method, $pattern, $action)
-    {
-        $method   = $this->getValidMethod($method);
-        $patterns = $this->parser->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]);
-    }
-
-    /**
-     * @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, "/");
-    }
-
-    /**
-     * Determine if the http method is valid.
-     *
-     * @param string $method
-     *
-     * @throws MethodNotSupportedException
-     * @return string
-     */
-
-    protected function getValidMethod($method)
-    {
-        $method = strtolower($method);
-
-        if (strpos(self::HTTP_METHODS, $method) === false) {
-            throw new MethodNotSupportedException($method);
-        }
-
-        return $method;
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getWildcards()
-    {
-        return $this->parser->getWildcards();
-    }
-
-    /**
-     * @return string[]
-     */
-
-    public function getWildcardTokens()
-    {
-        return $this->parser->getWildcardTokens();
-    }
-
-    /**
-     * @param string $wildcard
-     * @return string|null
-     */
-
-    public function getWildcard($wildcard)
-    {
-        return $this->parser->getWildcard($wildcard);
-    }
-
-    /**
-     * @param string $wildcard
-     * @param string $pattern
-     *
-     * @return self
-     */
-
-    public function setWildcard($wildcard, $pattern)
-    {
-        $this->parser->setWildcard($wildcard, $pattern);
-        return $this;
-    }
-
-    /**
-     * @return Parser
-     */
-
-    public function getParser()
-    {
-        return $this->parser;
-    }
-
-    /**
-     * @param Parser $parser
-     *
-     * @throws \LogicException
-     * @return self
-     */
-
-    public function setParser(Parser $parser)
-    {
-        if (!empty($this->statics) || !empty($this->dynamics)) {
-            throw new \LogicException("You can't define a route parser after registering a route.");
-        }
-
-        $this->parser = $parser;
-        return $this;
-    }
+	use Collectors\ControllerCollectorTrait;
+	use Collectors\ResourceCollectorTrait;
+
+
+	/**
+	 * 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 = [];
+
+	/**
+	 * The pattern parser instance.
+	 *
+	 * @var Parser
+	 */
+
+	protected $parser;
+
+	/**
+	 * Collector constructor.
+	 *
+	 * @param Parser|null $parser
+	 */
+
+	public function __construct(Parser $parser = null)
+	{
+		$this->parser = $parser ?: new Parser;
+	}
+
+	/**
+	 * @param string $method
+	 * @param string $pattern
+	 * @param callable $action
+	 *
+	 * @throws BadRouteException 
+	 * @throws MethodNotSupportedException
+	 *
+	 * @return Group
+	 */
+
+	public function set($method, $pattern, $action)
+	{
+		$method   = $this->getValidMethod($method);
+		$patterns = $this->parser->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]);
+	}
+
+	/**
+	 * @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, "/");
+	}
+
+	/**
+	 * Determine if the http method is valid.
+	 *
+	 * @param string $method
+	 *
+	 * @throws MethodNotSupportedException
+	 * @return string
+	 */
+
+	protected function getValidMethod($method)
+	{
+		$method = strtolower($method);
+
+		if (strpos(self::HTTP_METHODS, $method) === false) {
+			throw new MethodNotSupportedException($method);
+		}
+
+		return $method;
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getWildcards()
+	{
+		return $this->parser->getWildcards();
+	}
+
+	/**
+	 * @return string[]
+	 */
+
+	public function getWildcardTokens()
+	{
+		return $this->parser->getWildcardTokens();
+	}
+
+	/**
+	 * @param string $wildcard
+	 * @return string|null
+	 */
+
+	public function getWildcard($wildcard)
+	{
+		return $this->parser->getWildcard($wildcard);
+	}
+
+	/**
+	 * @param string $wildcard
+	 * @param string $pattern
+	 *
+	 * @return self
+	 */
+
+	public function setWildcard($wildcard, $pattern)
+	{
+		$this->parser->setWildcard($wildcard, $pattern);
+		return $this;
+	}
+
+	/**
+	 * @return Parser
+	 */
+
+	public function getParser()
+	{
+		return $this->parser;
+	}
+
+	/**
+	 * @param Parser $parser
+	 *
+	 * @throws \LogicException
+	 * @return self
+	 */
+
+	public function setParser(Parser $parser)
+	{
+		if (!empty($this->statics) || !empty($this->dynamics)) {
+			throw new \LogicException("You can't define a route parser after registering a route.");
+		}
+
+		$this->parser = $parser;
+		return $this;
+	}
     
 }

Braces +15 added lines, -8 removed lines

@@ -112,7 +112,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 $group;
@@ -137,8 +139,9 @@ 
     public function match(array $methods, $pattern, $action)
     {
         $group = new Group;
-        foreach ($methods as $method)
-            $group->set($this->set($method, $pattern, $action));
+        foreach ($methods as $method) {
+                    $group->set($this->set($method, $pattern, $action));
+        }
         return $group;
     }
 
@@ -181,8 +184,9 @@ 
     public function group(array $routes)
     {
         $group = new Group;
-        foreach ($routes as $route)
-            $group->set($route);
+        foreach ($routes as $route) {
+                    $group->set($route);
+        }
         return $group;
     }
 
@@ -197,7 +201,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]);
+        }
     }
 
     /**
@@ -210,8 +216,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

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

Indentation +97 added lines, -97 removed lines

@@ -27,102 +27,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 RouteResource
-     */
-
-    public function resource($controller, array $options = array())
-    {
-        $name       = isset($options["prefix"]) ? $options["prefix"] : "";
-        $name      .= $this->getResourceName($controller, $options);
-        $actions    = $this->getResourceActions($options);
-        $resource = new RouteResource;
-
-        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 RouteResource
-     */
-
-    public function resources(array $controllers)
-    {
-        $resource = new RouteResource;
-        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 RouteResource
+	 */
+
+	public function resource($controller, array $options = array())
+	{
+		$name       = isset($options["prefix"]) ? $options["prefix"] : "";
+		$name      .= $this->getResourceName($controller, $options);
+		$actions    = $this->getResourceActions($options);
+		$resource = new RouteResource;
+
+		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 RouteResource
+	 */
+
+	public function resources(array $controllers)
+	{
+		$resource = new RouteResource;
+		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/Matcher.php

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

Doc Comments +3 added lines, -2 removed lines

@@ -231,7 +231,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 checkStaticRouteInOtherMethods($targetHttpMethod, $path)
@@ -247,7 +247,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)
@@ -261,6 +261,7 @@ 
      * Strip the given http methods and return all the others.
      *
      * @param string|string[]
+     * @param string $targetHttpMethod
      * @return array
      */
 

Indentation +273 added lines, -273 removed lines

@@ -23,279 +23,279 @@
 class Matcher
 {
 
-    /**
-     * @var Collector
-     */
-
-    protected $collector;
-
-    /**
-     * @var Parser $parser
-     */
-
-    protected $parser;
-
-    /**
-     * 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)) ||
-            ($route = $this->matchDynamicRoute($httpMethod, $path))) {
-             $route->setMatcher($this);
-
-            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)
-    {
-        if ($routes = $this->collector->findDynamicRoutes($httpMethod, $path)) {
-            // cache the parser reference
-            $this->parser = $this->collector->getParser();
-            // 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)];
-                unset($matches[0]);
-
-                $route->setParams(array_combine($route->getParams(), array_filter($matches)));
-
-                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->getBlock()) {
-            return $route;
-        }
-
-        list($pattern, $params) = $this->parsePlaceholders($route->getPattern());
-        return $route->setPatternWithoutReset($pattern)->setParams($params)->setBlock(true);
-    }
-
-    /**
-     * Group several dynamic routes patterns into one big regex and maps
-     * the routes to the pattern positions in the big regex.
-     *
-     * @param Route[] $routes
-     * @return array
-     */
-
-    protected function buildGroup(array $routes)
-    {
-        $groupCount = (int) $map = $regex = [];
-
-        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 = [];
-        $parser = $this->parser;
-
-        preg_match_all("~" . $parser::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 matcher.");
-        }
-
-        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)
-    {
-        $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;
-    }
-
-    /**
-     * 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 string|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
-     */
+	/**
+	 * @var Collector
+	 */
+
+	protected $collector;
+
+	/**
+	 * @var Parser $parser
+	 */
+
+	protected $parser;
+
+	/**
+	 * 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)) ||
+			($route = $this->matchDynamicRoute($httpMethod, $path))) {
+			 $route->setMatcher($this);
+
+			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)
+	{
+		if ($routes = $this->collector->findDynamicRoutes($httpMethod, $path)) {
+			// cache the parser reference
+			$this->parser = $this->collector->getParser();
+			// 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)];
+				unset($matches[0]);
+
+				$route->setParams(array_combine($route->getParams(), array_filter($matches)));
+
+				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->getBlock()) {
+			return $route;
+		}
+
+		list($pattern, $params) = $this->parsePlaceholders($route->getPattern());
+		return $route->setPatternWithoutReset($pattern)->setParams($params)->setBlock(true);
+	}
+
+	/**
+	 * Group several dynamic routes patterns into one big regex and maps
+	 * the routes to the pattern positions in the big regex.
+	 *
+	 * @param Route[] $routes
+	 * @return array
+	 */
+
+	protected function buildGroup(array $routes)
+	{
+		$groupCount = (int) $map = $regex = [];
+
+		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 = [];
+		$parser = $this->parser;
+
+		preg_match_all("~" . $parser::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 matcher.");
+		}
+
+		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)
+	{
+		$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;
+	}
+
+	/**
+	 * 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 string|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;
+	}
 
 }

src/Resource.php

Braces +3 added lines, -1 removed lines

@@ -173,7 +173,9 @@
         foreach ($segments as $index => $segment) {
             if (strpos($segment, "{") === 0) {
                    $pattern .= "/{" . $segments[$index - 1] . "_" . ltrim($segment, "{");
-            } else $pattern .= $segment;
+            } else {
+            	$pattern .= $segment;
+            }
         }
 
         return $pattern;

Indentation +153 added lines, -153 removed lines

@@ -20,158 +20,158 @@
 class Resource extends Group
 {
 
-    /**
-     * @inheritdoc
-     * @throws \BadMethodCallException
-     */
-
-    public function setMethod($method)
-    {
-        throw new \BadMethodCallException("Resources can't chance they http method.");
-    }
-
-    /**
-     * Remove the routes without the passed methods.
-     *
-     * @param string|string[] $methods
-     * @return self
-     */
-
-    public function only($methods)
-    {
-        $this->filterByMethod((array) $methods, false);
-        return $this;
-    }
-
-    /**
-     * Remove the routes with the passed methods.
-     *
-     * @param string|string[] $methods
-     * @return self
-     */
-
-    public function except($methods)
-    {
-        $this->filterByMethod((array) $methods, true);
-        return $this;
-    }
-
-    /**
-     * Forget the grouped routes filtering by http methods.
-     *
-     * @param string[] $methods
-     * @param bool $alt Should remove?
-     */
-
-    private function filterByMethod(array $methods, $alt)
-    {
-        $methods = array_flip(array_map('strtolower', $methods));
-
-        foreach ($this->routes as $route) {
-            if (isset($methods[$route->getAction()[1]]) === $alt) {
-                $route->forget();
-            }
-        }
-    }
-
-    /**
-     * Translate the "make" or "edit" from resources path.
-     *
-     * @param string[] $translations
-     * @return self
-     */
-
-    public function translate(array $translations)
-    {
-        foreach ($this->routes as $route) {
-            $action = $route->getAction()[1];
-
-            if ($action === "make" && isset($translations["make"])) {
-                $route->setPatternWithoutReset(str_replace("make", $translations["make"], $route->getPattern()));
-            } elseif ($action === "edit" && isset($translations["edit"])) {
-                $route->setPatternWithoutReset(str_replace("edit", $translations["edit"], $route->getPattern()));
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add a route or a group of routes to the resource, it means that
-     * every added route will now receive the parameters of the resource, like id.
-     *
-     * @param Route|Group $route
-     * @return self
-     */
-
-    public function member($route)
-    {
-        $resource = new self;
-        $resource->set($route);
-        $this->nest($resource);
-    }
-
-    /**
-     * Nested routes capture the relation between a resource and another resource.
-     *
-     * @param self $resource
-     * @return self
-     */
-
-    public function nest(self $resource)
-    {
-        foreach ($this->routes as $route) {
-            if ($route->getAction()[1] === "show") {
-                $this->set($resource->forget()->setPrefix($this->getNestedPrefix($route->getPattern()))); break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Nest resources but with only build routes with the minimal amount of information
-     * to uniquely identify the resource.
-     *
-     * @param self $resource
-     * @return self
-     */
-
-    public function shallow(self $resource)
-    {
-        $newResource = new self;
-        $resource->forget();
-        $routes = $resource->all();
-
-        foreach ($routes as $route) {
-            if (strpos("index make create", $route->getAction()[1]) !== false) {
-                $newResource->set($route);
-            }
-        }
-
-        return $this->nest($newResource);
-    }
-
-    /**
-     * Resolve the nesting pattern, setting the prefixes based on
-     * parent resources patterns.
-     *
-     * @param string $pattern
-     * @return string
-     */
-
-    protected function getNestedPrefix($pattern)
-    {
-        $segments = explode("/", $pattern);
-        $pattern = "";
-
-        foreach ($segments as $index => $segment) {
-            if (strpos($segment, "{") === 0) {
-                   $pattern .= "/{" . $segments[$index - 1] . "_" . ltrim($segment, "{");
-            } else $pattern .= $segment;
-        }
-
-        return $pattern;
-    }
+	/**
+	 * @inheritdoc
+	 * @throws \BadMethodCallException
+	 */
+
+	public function setMethod($method)
+	{
+		throw new \BadMethodCallException("Resources can't chance they http method.");
+	}
+
+	/**
+	 * Remove the routes without the passed methods.
+	 *
+	 * @param string|string[] $methods
+	 * @return self
+	 */
+
+	public function only($methods)
+	{
+		$this->filterByMethod((array) $methods, false);
+		return $this;
+	}
+
+	/**
+	 * Remove the routes with the passed methods.
+	 *
+	 * @param string|string[] $methods
+	 * @return self
+	 */
+
+	public function except($methods)
+	{
+		$this->filterByMethod((array) $methods, true);
+		return $this;
+	}
+
+	/**
+	 * Forget the grouped routes filtering by http methods.
+	 *
+	 * @param string[] $methods
+	 * @param bool $alt Should remove?
+	 */
+
+	private function filterByMethod(array $methods, $alt)
+	{
+		$methods = array_flip(array_map('strtolower', $methods));
+
+		foreach ($this->routes as $route) {
+			if (isset($methods[$route->getAction()[1]]) === $alt) {
+				$route->forget();
+			}
+		}
+	}
+
+	/**
+	 * Translate the "make" or "edit" from resources path.
+	 *
+	 * @param string[] $translations
+	 * @return self
+	 */
+
+	public function translate(array $translations)
+	{
+		foreach ($this->routes as $route) {
+			$action = $route->getAction()[1];
+
+			if ($action === "make" && isset($translations["make"])) {
+				$route->setPatternWithoutReset(str_replace("make", $translations["make"], $route->getPattern()));
+			} elseif ($action === "edit" && isset($translations["edit"])) {
+				$route->setPatternWithoutReset(str_replace("edit", $translations["edit"], $route->getPattern()));
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a route or a group of routes to the resource, it means that
+	 * every added route will now receive the parameters of the resource, like id.
+	 *
+	 * @param Route|Group $route
+	 * @return self
+	 */
+
+	public function member($route)
+	{
+		$resource = new self;
+		$resource->set($route);
+		$this->nest($resource);
+	}
+
+	/**
+	 * Nested routes capture the relation between a resource and another resource.
+	 *
+	 * @param self $resource
+	 * @return self
+	 */
+
+	public function nest(self $resource)
+	{
+		foreach ($this->routes as $route) {
+			if ($route->getAction()[1] === "show") {
+				$this->set($resource->forget()->setPrefix($this->getNestedPrefix($route->getPattern()))); break;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Nest resources but with only build routes with the minimal amount of information
+	 * to uniquely identify the resource.
+	 *
+	 * @param self $resource
+	 * @return self
+	 */
+
+	public function shallow(self $resource)
+	{
+		$newResource = new self;
+		$resource->forget();
+		$routes = $resource->all();
+
+		foreach ($routes as $route) {
+			if (strpos("index make create", $route->getAction()[1]) !== false) {
+				$newResource->set($route);
+			}
+		}
+
+		return $this->nest($newResource);
+	}
+
+	/**
+	 * Resolve the nesting pattern, setting the prefixes based on
+	 * parent resources patterns.
+	 *
+	 * @param string $pattern
+	 * @return string
+	 */
+
+	protected function getNestedPrefix($pattern)
+	{
+		$segments = explode("/", $pattern);
+		$pattern = "";
+
+		foreach ($segments as $index => $segment) {
+			if (strpos($segment, "{") === 0) {
+				   $pattern .= "/{" . $segments[$index - 1] . "_" . ltrim($segment, "{");
+			} else $pattern .= $segment;
+		}
+
+		return $pattern;
+	}
 
 }

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

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
     {
         if ($route->hasMetadata($this->metadataStrategyKey)) {
                $route->setStrategy($route->getMetadata($this->metadataStrategyKey));
-        } else $route->setStrategy(null);
+        } else {
+        	$route->setStrategy(null);
+        }
 
         $this->enhance($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

Braces +9 added lines, -5 removed lines

@@ -69,8 +69,9 @@ 
     public function controllers(array $controllers)
     {
         $group = new Group;
-        foreach ($controllers as $controller)
-            $group->set($this->controller($controller));
+        foreach ($controllers as $controller) {
+                    $group->set($this->controller($controller));
+        }
         return $group;
     }
 
@@ -100,8 +101,9 @@ 
     public function controllersWithoutPrefix(array $controllers)
     {
         $group = new Group;
-        foreach ($controllers as $controller)
-            $group->set($this->controllerWithoutPrefix($controller));
+        foreach ($controllers as $controller) {
+                    $group->set($this->controllerWithoutPrefix($controller));
+        }
         return $group;
     }
 
@@ -134,7 +136,9 @@ 
 
                 if ($strategy !== null) {
                        $route->setStrategy($strategy);
-                } else $route->setStrategy($controllerDefaultStrategy);
+                } else {
+                	$route->setStrategy($controllerDefaultStrategy);
+                }
 
                 $group->set($route);
             }

Indentation +229 added lines, -229 removed lines

@@ -26,235 +26,235 @@
 trait ControllerCollectorTrait
 {
 
-    /**
-     * @return Parser
-     */
-
-    abstract public function getParser();
-
-    /**
-     * @param string $method
-     * @param string $pattern
-     * @param callable $action
-     *
-     * @return Group
-     */
-
-    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]);
+	/**
+	 * @return Parser
+	 */
+
+	abstract public function getParser();
+
+	/**
+	 * @param string $method
+	 * @param string $pattern
+	 * @param callable $action
+	 *
+	 * @return Group
+	 */
+
+	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);
-
-                $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->getParser()->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);
+
+				$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->getParser()->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/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";
 
 }