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

refactoring the routing engine.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-04 22:40:33 -05:00
parent 3e874867b8
commit d35e2abd77
8 changed files with 243 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/config/container.php
View File

@@ -150,12 +150,18 @@ return array(
}),
'laravel.router' => array('singleton' => true, 'resolver' => function($container)
'laravel.routing.router' => array('singleton' => true, 'resolver' => function($container)
{
return new Routing\Router($container->resolve('laravel.request'), require APP_PATH.'routes'.EXT, CONTROLLER_PATH);
}),
'laravel.routing.caller' => array('resolver' => function($container)
{
return new Routing\Caller($container, CONTROLLER_PATH);
}),
'laravel.session' => array('singleton' => true, 'resolver' => function($container)
{
return $container->resolve('laravel.session.manager')->driver($container->resolve('laravel.config')->get('session.driver'));
@@ -176,7 +182,7 @@ return array(
$container->resolve('laravel.config')->get('application.index'),
);
return new URL($container->resolve('laravel.router'), $base, $index, $request->secure());
return new URL($container->resolve('laravel.routing.router'), $base, $index, $request->secure());
}),