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

finished refactoring of the redirect generator.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-29 00:27:03 -05:00
parent 9be3d1a54b
commit f79dd1ba5d
3 changed files with 29 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
laravel/config/container.php
View File

@@ -12,8 +12,6 @@ return array(
{
$config = $container->resolve('laravel.config');
$connections = $config->get('database.connections');
return new Database\Manager($config->get('database.connections'), $config->get('database.default'));
}),
@@ -24,28 +22,6 @@ return array(
}),
'laravel.form' => array('singleton' => true, 'resolver' => function($container)
{
$request = $container->resolve('laravel.request');
$html = $container->resolve('laravel.html');
$url = $container->resolve('laravel.url');
$token = ($container->registered('laravel.session.driver')) ? $container->resolve('laravel.session.driver')->get('csrf_token') : null;
return new Form($request, $html, $url, $token);
}),
'laravel.html' => array('singleton' => true, 'resolver' => function($container)
{
$encoding = $container->resolve('laravel.config')->get('application.encoding');
return new HTML($container->resolve('laravel.url'), $encoding);
}),
'laravel.input' => array('singleton' => true, 'resolver' => function($container)
{
$application = $container->resolve('laravel.application');
@@ -75,11 +51,9 @@ return array(
}),
'laravel.responder' => array('singleton' => true, 'resolver' => function($container)
'laravel.redirect' => array('singleton' => true, 'resolver' => function($container)
{
require_once SYS_PATH.'response'.PHP;
return new Response_Factory($container->resolve('laravel.view'), $container->resolve('laravel.file'));
return new Redirect($container->resolve('laravel.url'));
}),
@@ -91,13 +65,11 @@ return array(
'laravel.url' => array('singleton' => true, 'resolver' => function($container)
{
$config = $container->resolve('laravel.config');
$request = $container->resolve('laravel.request');
$base = $config->get('application.url');
$base = $container->resolve('laravel.config')->get('application.url');
$index = $config->get('application.index');
$index = $container->resolve('laravel.config')->get('application.index');
return new URL($container->resolve('laravel.router'), $base, $index, $request->secure);
}),