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

more dependency injection!

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-31 00:07:45 -05:00
parent c200f3eb1e
commit c7ddbbb018
20 changed files with 118 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
laravel/config/container.php
View File

@@ -47,23 +47,41 @@ return array(
}),
'laravel.form' => array('resolver' => function($container)
{
list($request, $html, $url) = array(
$container->resolve('laravel.request'),
$container->resolve('laravel.html'),
$container->resolve('laravel.url'),
);
return new Form($request, $html, $url);
}),
'laravel.html' => array('resolver' => function($container)
{
return new HTML($container->resolve('laravel.url'), $container->resolve('laravel.config')->get('application.encoding'));
}),
'laravel.input' => array('singleton' => true, 'resolver' => function($container)
{
$application = $container->resolve('laravel.application');
$request = $container->resolve('laravel.request');
$input = array();
if ($application->request->method() == 'GET')
if ($request->method() == 'GET')
{
$input = $_GET;
}
elseif ($application->request->method() == 'POST')
elseif ($request->method() == 'POST')
{
$input = $_POST;
}
elseif ($application->request->method() == 'PUT' or $application->request->method == 'DELETE')
elseif ($request->method() == 'PUT' or $request->method == 'DELETE')
{
($application->request->spoofed()) ? $input = $_POST : parse_str(file_get_contents('php://input'), $input);
($request->spoofed()) ? $input = $_POST : parse_str(file_get_contents('php://input'), $input);
}
return new Input($input, $_FILES, $container->resolve('laravel.cookie'));
@@ -98,7 +116,7 @@ return array(
'laravel.request' => array('singleton' => true, 'resolver' => function($container)
{
return new Request($_SERVER, $container->resolve('laravel.config')->get('application.url'));
return new Request($_SERVER, $_POST, $container->resolve('laravel.config')->get('application.url'));
}),
@@ -265,7 +283,7 @@ return array(
}),
'laravel.cache.memcache.connection' => array('singleton' => true, 'resolver' => function()
'laravel.cache.memcache.connection' => array('singleton' => true, 'resolver' => function($container)
{
if ( ! class_exists('Memcache'))
{
@@ -274,7 +292,7 @@ return array(
$memcache = new \Memcache;
foreach (Config::get('cache.servers') as $server)
foreach ($container->resolve('laravel.config')->get('cache.servers') as $server)
{
$memcache->addServer($server['host'], $server['port'], true, $server['weight']);
}