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

fixed bugs found when unit testing.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-02 23:02:23 -05:00
parent 9caf239f6b
commit 895d876463
4 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/response.php
View File

@@ -14,14 +14,14 @@ class Response {
*
* @var int
*/
protected $status;
public $status;
/**
* The response headers.
*
* @var array
*/
protected $headers = array();
public $headers = array();
/**
* HTTP status codes.

65
laravel/routing/controller.php
View File

@@ -28,9 +28,9 @@ abstract class Controller {
* For example, a destination of "user.profile@show" would call the User_Profile
* controller's show method with the given parameters.
*
* @param string $destination
* @param array $parameters
* @return mixed
* @param string $destination
* @param array $parameters
* @return Response
*/
public static function call($destination, $parameters = array())
{
@@ -43,30 +43,12 @@ abstract class Controller {
$controller = static::resolve($controller);
if (is_null($controller) or static::hidden($method))
if (is_null($controller))
{
return Response::error('404');
}
// Again, as was the case with route closures, if the controller
// "before" filters return a response, it will be considered the
// response to the request and the controller method will not be
// used to handle the request to the application.
$response = Filter::run($controller->filters('before'), array(), true);
if (is_null($response))
{
$response = call_user_func_array(array($controller, $method), $parameters);
}
// The after filter and the framework expects all responses to
// be instances of the Response class. If the method did not
// return an instsance of Response, we will make on now.
if ( ! $response instanceof Response) $response = new Response($response);
Filter::run($controller->filters('after'), array($response));
return $response;
return $controller->execute($method, $parameters);
}
/**
@@ -106,7 +88,7 @@ abstract class Controller {
if (file_exists($path = CONTROLLER_PATH.$controller.EXT))
{
require $path;
require_once $path;
return true;
}
@@ -114,6 +96,41 @@ abstract class Controller {
return false;
}
/**
* Execute a controller method with the given parameters.
*
* @param string $method
* @param array $parameters
* @return Response
*/
public function execute($method, $parameters = array())
{
if (static::hidden($method))
{
return Response::error('404');
}
// Again, as was the case with route closures, if the controller
// "before" filters return a response, it will be considered the
// response to the request and the controller method will not be
// used to handle the request to the application.
$response = Filter::run($this->filters('before'), array(), true);
if (is_null($response))
{
$response = call_user_func_array(array($this, $method), $parameters);
}
// The after filter and the framework expects all responses to
// be instances of the Response class. If the method did not
// return an instsance of Response, we will make on now.
if ( ! $response instanceof Response) $response = new Response($response);
Filter::run($this->filters('after'), array($response));
return $response;
}
/**
* Determine if a given controller method is callable.
*

4
laravel/routing/route.php
View File

@@ -186,7 +186,9 @@ class Route {
{
if (is_array($this->callback) and isset($this->callback[$name]))
{
return (array) $this->callback[$name];
$filters = $this->callback[$name];
return (is_string($filters)) ? explode('|', $filters) : (array) $filters;
}
return array();

2
laravel/routing/router.php
View File

@@ -272,7 +272,7 @@ class Router {
for ($i = 0; $i < $count; $i++)
{
if (preg_match('/\(.+\)/', $route[$i]))
if (preg_match('/\(.+\)/', $route[$i]) and isset($uri[$i]))
{
$parameters[] = $uri[$i];
}