Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Got rid of all IoC::container() calls
This commit is contained in:
Taylor Otwell 2011-11-11 06:44:35 -08:00
parent 9dbe7a29e2 b4fe148de5
commit c11ee76511
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/cache/manager.php vendored
View File

@ -32,12 +32,12 @@ public static function driver($driver = null)
if ( ! array_key_exists($driver, static::$drivers)) 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."); 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]; return static::$drivers[$driver];
@ -62,4 +62,4 @@ public static function __callStatic($method, $parameters)
return call_user_func_array(array(static::driver(), $method), $parameters); return call_user_func_array(array(static::driver(), $method), $parameters);
} }
} }

16
laravel/container.php
View File

@ -107,7 +107,7 @@ public function __construct($registry = array())
* *
* <code> * <code>
* // Register an object and its resolver * // Register an object and its resolver
* IoC::container()->register('mailer', function($c) {return new Mailer;}); * IoC::register('mailer', function($c) {return new Mailer;});
* </code> * </code>
* *
* @param string $name * @param string $name
@ -153,7 +153,7 @@ public function singleton($name, $resolver)
* *
* <code> * <code>
* // Register an instance as a singleton in the container * // Register an instance as a singleton in the container
* IoC::container()->instance('mailer', new Mailer); * IoC::instance('mailer', new Mailer);
* </code> * </code>
* *
* @param string $name * @param string $name
@ -170,13 +170,13 @@ public function instance($name, $instance)
* *
* <code> * <code>
* // Resolve the "laravel.router" class from the container * // Resolve the "laravel.router" class from the container
* $input = IoC::container()->core('router'); * $input = IoC::core('router');
* *
* // Equivalent resolution using the "resolve" method * // 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 * // Pass an array of parameters to the resolver
* $input = IoC::container()->core('router', array('test')); * $input = IoC::core('router', array('test'));
* </code> * </code>
* *
* @param string $name * @param string $name
@ -193,10 +193,10 @@ public function core($name, $parameters = array())
* *
* <code> * <code>
* // Get an instance of the "mailer" object registered in the container * // 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 * // Pass an array of parameters to the resolver
* $mailer = IoC::container()->resolve('mailer', array('test')); * $mailer = IoC::resolve('mailer', array('test'));
* </code> * </code>
* *
* @param string $name * @param string $name
@ -222,4 +222,4 @@ public function resolve($name, $parameters = array())
return $object; return $object;
} }
} }

4
laravel/facades.php
View File

@ -27,7 +27,7 @@ abstract class Facade {
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
$class = IoC::container()->resolve(static::$resolve); $class = IoC::resolve(static::$resolve);
$count = count($parameters); $count = count($parameters);
@ -59,4 +59,4 @@ public static function __callStatic($method, $parameters)
} }
class Session extends Facade { public static $resolve = 'laravel.session'; } class Session extends Facade { public static $resolve = 'laravel.session'; }

4
laravel/form.php
View File

@ -149,7 +149,7 @@ public static function close()
*/ */
public static function token() public static function token()
{ {
$token = IoC::container()->core('session')->token(); $token = IoC::core('session')->token();
return static::input('hidden', 'csrf_token', $token); return static::input('hidden', 'csrf_token', $token);
} }
@ -540,4 +540,4 @@ protected static function id($name, $attributes)
} }
} }
} }

6
laravel/input.php
View File

@ -72,7 +72,7 @@ public static function flash()
{ {
if (Config::$items['session']['driver'] !== '') 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 @@ public static function old($key = null, $default = null)
throw new \Exception('A session driver must be specified in order to access old 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); return Arr::get($old, $key, $default);
} }
@ -153,4 +153,4 @@ public static function upload($key, $path)
return array_key_exists($key, $_FILES) ? File::upload($key, $path, $_FILES) : false; return array_key_exists($key, $_FILES) ? File::upload($key, $path, $_FILES) : false;
} }
} }

4
laravel/laravel.php
View File

@ -103,7 +103,7 @@
$id = Cookie::get(Config::$items['session']['cookie']); $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));
} }
/** /**
@ -198,4 +198,4 @@
IoC::core('session')->save($driver); IoC::core('session')->save($driver);
} }
$response->send(); $response->send();

4
laravel/redirect.php
View File

@ -61,7 +61,7 @@ public function with($key, $value)
throw new \Exception('A session driver must be set before setting flash data.'); 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; return $this;
} }
@ -94,4 +94,4 @@ public static function __callStatic($method, $parameters)
throw new \Exception("Method [$method] is not defined on the Redirect class."); throw new \Exception("Method [$method] is not defined on the Redirect class.");
} }
} }

4
laravel/request.php
View File

@ -154,7 +154,7 @@ public static function secure()
*/ */
public static function forged() public static function forged()
{ {
return Input::get('csrf_token') !== IoC::container()->core('session')->token(); return Input::get('csrf_token') !== IoC::core('session')->token();
} }
/** /**
@ -179,4 +179,4 @@ public static function route()
return static::$route; return static::$route;
} }
} }

12
laravel/routing/controller.php
View File

@ -68,9 +68,9 @@ public static function resolve($controller)
// If the controller is registered in the IoC container, we will resolve // If the controller is registered in the IoC container, we will resolve
// it out of the container. Using constructor injection on controllers // it out of the container. Using constructor injection on controllers
// via the container allows more flexible and testable applications. // 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'; $controller = str_replace(' ', '_', ucwords(str_replace('.', ' ', $controller))).'_Controller';
@ -216,17 +216,17 @@ public function __call($method, $parameters)
* $mailer = $this->mailer; * $mailer = $this->mailer;
* *
* // Equivalent call using the IoC container instance * // Equivalent call using the IoC container instance
* $mailer = IoC::container()->resolve('mailer'); * $mailer = IoC::resolve('mailer');
* </code> * </code>
*/ */
public function __get($key) 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."); throw new \Exception("Attempting to access undefined property [$key] on controller.");
} }
} }

8
laravel/security/auth.php
View File

@ -74,7 +74,7 @@ public static function user()
{ {
if ( ! is_null(static::$user)) return static::$user; 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); static::$user = call_user_func(Config::get('auth.user'), $id);
@ -152,7 +152,7 @@ public static function login($user, $remember = false)
if ($remember) static::remember($user->id); 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 @@ public static function logout()
Cookie::forget(Auth::remember_key); Cookie::forget(Auth::remember_key);
IoC::container()->core('session')->forget(Auth::user_key); IoC::core('session')->forget(Auth::user_key);
} }
} }