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

revert back to more sensible architecture.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-20 23:14:09 -05:00
parent 47db2ff19b
commit 4525eae25a
33 changed files with 1050 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
laravel/laravel.php
View File

@@ -8,27 +8,25 @@ require 'core.php';
// --------------------------------------------------------------
// Get an instance of the configuration manager.
// --------------------------------------------------------------
$config = $container->resolve('laravel.config');
set_exception_handler(function($e) use ($config)
set_exception_handler(function($e)
{
call_user_func($config->get('error.handler'), $e);
call_user_func(Config::get('error.handler'), $e);
});
set_error_handler(function($number, $error, $file, $line) use ($config)
set_error_handler(function($number, $error, $file, $line)
{
$exception = new \ErrorException($error, $number, 0, $file, $line);
call_user_func($config->get('error.handler'), $exception);
call_user_func(Config::get('error.handler'), $exception);
});
register_shutdown_function(function() use ($config)
register_shutdown_function(function()
{
if ( ! is_null($error = error_get_last()))
{
$exception = new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
call_user_func($config->get('error.handler'), $exception);
call_user_func(Config::get('error.handler'), $exception);
}
});
@@ -42,22 +40,22 @@ ini_set('display_errors', 'Off');
// --------------------------------------------------------------
// Set the default timezone.
// --------------------------------------------------------------
date_default_timezone_set($config->get('application.timezone'));
date_default_timezone_set(Config::get('application.timezone'));
// --------------------------------------------------------------
// Load the session and session manager.
// --------------------------------------------------------------
if ($config->get('session.driver') !== '')
if (Config::get('session.driver') !== '')
{
$session = $container->resolve('laravel.session.manager');
$container->instance('laravel.session', $session->payload($config->get('session')));
$container->instance('laravel.session', $session->payload(Config::get('session')));
}
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
$route = $container->resolve('laravel.routing.router')->route($container->resolve('laravel.request'));
$route = $container->resolve('laravel.routing.router')->route(Request::method(), Request::uri());
if ( ! is_null($route))
{
@@ -65,7 +63,7 @@ if ( ! is_null($route))
}
else
{
$response = $container->resolve('laravel.response')->error('404');
$response = Response::error('404');
}
// --------------------------------------------------------------
@@ -78,13 +76,13 @@ $response->content = $response->render();
// --------------------------------------------------------------
if (isset($session))
{
$session->close($container->resolve('laravel.session'), $config->get('session'));
$session->close($container->resolve('laravel.session'), Config::get('session'));
}
// --------------------------------------------------------------
// Send the queued cookies to the browser.
// --------------------------------------------------------------
$container->resolve('laravel.cookie')->send();
Cookie::send();
// --------------------------------------------------------------
// Send the response to the browser.