Commit c11ee765 authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #151 from sparksp/develop/ioc-container

Got rid of all IoC::container() calls
parents 9dbe7a29 b4fe148d
......@@ -32,12 +32,12 @@ class Manager {
if ( ! array_key_exists($driver, static::$drivers))
{
if ( ! IoC::container()->registered("laravel.cache.{$driver}"))
if ( ! IoC::registered("laravel.cache.{$driver}"))
{
throw new \Exception("Cache driver [$driver] is not supported.");
}
return static::$drivers[$driver] = IoC::container()->core("cache.{$driver}");
return static::$drivers[$driver] = IoC::core("cache.{$driver}");
}
return static::$drivers[$driver];
......
......@@ -107,7 +107,7 @@ class Container {
*
* <code>
* // Register an object and its resolver
* IoC::container()->register('mailer', function($c) {return new Mailer;});
* IoC::register('mailer', function($c) {return new Mailer;});
* </code>
*
* @param string $name
......@@ -153,7 +153,7 @@ class Container {
*
* <code>
* // Register an instance as a singleton in the container
* IoC::container()->instance('mailer', new Mailer);
* IoC::instance('mailer', new Mailer);
* </code>
*
* @param string $name
......@@ -170,13 +170,13 @@ class Container {
*
* <code>
* // Resolve the "laravel.router" class from the container
* $input = IoC::container()->core('router');
* $input = IoC::core('router');
*
* // Equivalent resolution using the "resolve" method
* $input = IoC::container()->resolve('laravel.router');
* $input = IoC::resolve('laravel.router');
*
* // Pass an array of parameters to the resolver
* $input = IoC::container()->core('router', array('test'));
* $input = IoC::core('router', array('test'));
* </code>
*
* @param string $name
......@@ -193,10 +193,10 @@ class Container {
*
* <code>
* // Get an instance of the "mailer" object registered in the container
* $mailer = IoC::container()->resolve('mailer');
* $mailer = IoC::resolve('mailer');
*
* // Pass an array of parameters to the resolver
* $mailer = IoC::container()->resolve('mailer', array('test'));
* $mailer = IoC::resolve('mailer', array('test'));
* </code>
*
* @param string $name
......
......@@ -27,7 +27,7 @@ abstract class Facade {
*/
public static function __callStatic($method, $parameters)
{
$class = IoC::container()->resolve(static::$resolve);
$class = IoC::resolve(static::$resolve);
$count = count($parameters);
......
......@@ -149,7 +149,7 @@ class Form {
*/
public static function token()
{
$token = IoC::container()->core('session')->token();
$token = IoC::core('session')->token();
return static::input('hidden', 'csrf_token', $token);
}
......
......@@ -72,7 +72,7 @@ class Input {
{
if (Config::$items['session']['driver'] !== '')
{
IoC::container()->core('session')->flash(Input::old_input, static::get());
IoC::core('session')->flash(Input::old_input, static::get());
}
}
......@@ -109,7 +109,7 @@ class Input {
throw new \Exception('A session driver must be specified in order to access old input.');
}
$old = IoC::container()->core('session')->get(Input::old_input, array());
$old = IoC::core('session')->get(Input::old_input, array());
return Arr::get($old, $key, $default);
}
......
......@@ -103,7 +103,7 @@ if (Config::$items['session']['driver'] !== '')
$id = Cookie::get(Config::$items['session']['cookie']);
IoC::container()->instance('laravel.session', new Session\Manager($driver, $id));
IoC::instance('laravel.session', new Session\Manager($driver, $id));
}
/**
......
......@@ -61,7 +61,7 @@ class Redirect extends Response {
throw new \Exception('A session driver must be set before setting flash data.');
}
IoC::container()->core('session')->flash($key, $value);
IoC::core('session')->flash($key, $value);
return $this;
}
......
......@@ -154,7 +154,7 @@ class Request {
*/
public static function forged()
{
return Input::get('csrf_token') !== IoC::container()->core('session')->token();
return Input::get('csrf_token') !== IoC::core('session')->token();
}
/**
......
......@@ -68,9 +68,9 @@ abstract class Controller {
// If the controller is registered in the IoC container, we will resolve
// it out of the container. Using constructor injection on controllers
// via the container allows more flexible and testable applications.
if (IoC::container()->registered('controllers.'.$controller))
if (IoC::registered('controllers.'.$controller))
{
return IoC::container()->resolve('controllers.'.$controller);
return IoC::resolve('controllers.'.$controller);
}
$controller = str_replace(' ', '_', ucwords(str_replace('.', ' ', $controller))).'_Controller';
......@@ -216,14 +216,14 @@ abstract class Controller {
* $mailer = $this->mailer;
*
* // Equivalent call using the IoC container instance
* $mailer = IoC::container()->resolve('mailer');
* $mailer = IoC::resolve('mailer');
* </code>
*/
public function __get($key)
{
if (IoC::container()->registered($key))
if (IoC::registered($key))
{
return IoC::container()->resolve($key);
return IoC::resolve($key);
}
throw new \Exception("Attempting to access undefined property [$key] on controller.");
......
......@@ -74,7 +74,7 @@ class Auth {
{
if ( ! is_null(static::$user)) return static::$user;
$id = IoC::container()->core('session')->get(Auth::user_key);
$id = IoC::core('session')->get(Auth::user_key);
static::$user = call_user_func(Config::get('auth.user'), $id);
......@@ -152,7 +152,7 @@ class Auth {
if ($remember) static::remember($user->id);
IoC::container()->core('session')->put(Auth::user_key, $user->id);
IoC::core('session')->put(Auth::user_key, $user->id);
}
/**
......@@ -195,7 +195,7 @@ class Auth {
Cookie::forget(Auth::remember_key);
IoC::container()->core('session')->forget(Auth::user_key);
IoC::core('session')->forget(Auth::user_key);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment