|
@@ -47,11 +47,10 @@ class Route {
|
|
|
/**
|
|
|
* Create a new Route instance.
|
|
|
*
|
|
|
- * @param string $method
|
|
|
- * @param string $uri
|
|
|
- * @param array $action
|
|
|
- * @param array $parameters
|
|
|
- * @return void
|
|
|
+ * @param string $method
|
|
|
+ * @param string $uri
|
|
|
+ * @param array $action
|
|
|
+ * @param array $parameters
|
|
|
*/
|
|
|
public function __construct($method, $uri, $action, $parameters = array())
|
|
|
{
|
|
@@ -67,18 +66,17 @@ class Route {
|
|
|
// We'll set the parameters based on the number of parameters passed
|
|
|
// compared to the parameters that were needed. If more parameters
|
|
|
// are needed, we'll merge in defaults.
|
|
|
- $this->parameters($uri, $action, $parameters);
|
|
|
+ $this->parameters($action, $parameters);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Set the parameters array to the correct value.
|
|
|
*
|
|
|
- * @param string $uri
|
|
|
* @param array $action
|
|
|
* @param array $parameters
|
|
|
* @return void
|
|
|
*/
|
|
|
- protected function parameters($uri, $action, $parameters)
|
|
|
+ protected function parameters($action, $parameters)
|
|
|
{
|
|
|
$defaults = (array) array_get($action, 'defaults');
|
|
|
|
|
@@ -114,7 +112,7 @@ class Route {
|
|
|
|
|
|
// We always return a Response instance from the route calls, so
|
|
|
// we'll use the prepare method on the Response class to make
|
|
|
- // sure we have a valid Response isntance.
|
|
|
+ // sure we have a valid Response instance.
|
|
|
$response = Response::prepare($response);
|
|
|
|
|
|
Filter::run($this->filters('after'), array($response));
|
|
@@ -252,7 +250,7 @@ class Route {
|
|
|
/**
|
|
|
* Register a controller with the router.
|
|
|
*
|
|
|
- * @param string|array $controller
|
|
|
+ * @param string|array $controllers
|
|
|
* @param string|array $defaults
|
|
|
* @return void
|
|
|
*/
|
|
@@ -394,4 +392,4 @@ class Route {
|
|
|
return Router::route(strtoupper($method), $uri)->call();
|
|
|
}
|
|
|
|
|
|
-}
|
|
|
+}
|