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

added facades and made other ioc improvements.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-30 22:09:47 -05:00
parent 501953f2db
commit 0ef96fb8d0
27 changed files with 271 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
laravel/laravel.php
View File

@@ -42,22 +42,11 @@ register_shutdown_function(function() use ($application)
// --------------------------------------------------------------
date_default_timezone_set($application->config->get('application.timezone'));
// --------------------------------------------------------------
// Initialize the request instance for the request.
// --------------------------------------------------------------
$application->request = new Request($_SERVER, $application->config->get('application.url'));
$application->container->instance('laravel.request', $application->request);
// --------------------------------------------------------------
// Load the session and session manager.
// --------------------------------------------------------------
if ($application->config->get('session.driver') !== '')
{
$application->session = Session\Manager::driver($application->container, $application->config->get('session.driver'));
$application->container->instance('laravel.session.driver', $application->session);
$application->session->start($application->input->cookies->get('laravel_session'), $application->config->get('session.lifetime'));
}
@@ -76,7 +65,7 @@ unset($packages);
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
$route = $application->container->resolve('laravel.router')->route();
$route = $application->router->route();
if ( ! is_null($route))
{
@@ -86,7 +75,7 @@ if ( ! is_null($route))
}
else
{
$response = new Error('404');
$response = $application->response->error('404');
}
// --------------------------------------------------------------
@@ -97,7 +86,7 @@ $response->content = $response->render();
// --------------------------------------------------------------
// Close the session.
// --------------------------------------------------------------
if ( ! is_null($application->session))
if ($application->config->get('session.driver') !== '')
{
$application->session->close($application->input, $application->config->get('session'));
}