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

reverting di refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-29 22:31:50 -05:00
parent f5680e4537
commit ef9e4dfd61
12 changed files with 101 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
laravel/laravel.php
View File

@@ -37,12 +37,52 @@ if (Config::$items['session']['driver'] !== '')
* Manually load some core classes that are used on every request
* This allows to avoid using the loader for these classes.
*/
require SYS_PATH.'uri'.EXT;
require SYS_PATH.'input'.EXT;
require SYS_PATH.'request'.EXT;
require SYS_PATH.'response'.EXT;
require SYS_PATH.'routing/route'.EXT;
require SYS_PATH.'routing/router'.EXT;
require SYS_PATH.'routing/loader'.EXT;
require SYS_PATH.'routing/filter'.EXT;
/**
* Gather the input to the application for the current request.
* The input will be gathered based on the current request method
* and will be set on the Input manager.
*/
$input = array();
switch (Request::method())
{
case 'GET':
$input = $_GET;
break;
case 'POST':
$input = $_POST;
break;
case 'PUT':
case 'DELETE':
if (Request::spoofed())
{
$input = $_POST;
}
else
{
parse_str(file_get_contents('php://input'), $input);
}
}
/**
* The spoofed request method is removed from the input so it is
* not unexpectedly included in Input::all() or Input::get().s
*/
unset($input[Request::spoofer]);
Input::$input = $input;
/**
* Route the request to the proper route in the application. If a
* route is found, the route will be called with the current request
@@ -51,13 +91,13 @@ require SYS_PATH.'routing/filter'.EXT;
*/
Routing\Filter::register(require APP_PATH.'filters'.EXT);
$request = IoC::container()->core('request');
list($uri, $method) = array(Request::uri()->get(), Request::method());
$request->route = IoC::container()->core('routing.router')->route($request);
Request::$route = IoC::container()->core('routing.router')->route($method, $uri);
if ( ! is_null($request->route))
if ( ! is_null(Request::$route))
{
$response = $request->route->call();
$response = Request::$route->call();
}
else
{