ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more refactoring for 2.0

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-19 21:33:25 -05:00
parent 7898094e25
commit a8dbe777df
13 changed files with 505 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/routing/route.php
View File

@@ -95,11 +95,13 @@ class Route {
}
// Otherwise, we will assume the route is an array and will return the first value with
// a key of "do", or the first instance of a Closure. If the value is a string, the route
// is delegating the responsibility for handling the request to a controller.
// a key of "delegate", or the first instance of a Closure. If the value is a string, the
// route is delegating the responsibility for handling the request to a controller.
elseif (is_array($this->callback))
{
return Arr::first($this->callback, function($key, $value) {return $key == 'do' or $value instanceof Closure;});
$callback = Arr::first($this->callback, function($key, $value) {return $key == 'delegate' or $value instanceof Closure;});
return ($callback instanceof Closure) ? call_user_func_array($callback, $this->parameters) : new Delegate($callback);
}
// If a value defined for a route is a string, it means the route is delegating control
@@ -107,7 +109,7 @@ class Route {
// for the route caller to parse and delegate.
elseif (is_string($this->callback))
{
return $this->callback;
return new Delegate($this->callback);
}
}