more refactoring on DI and IoC.

2011-09-20 23:36:13 -05:00
parent 4525eae25a
commit 600e411ad4
10 changed files with 36 additions and 144 deletions
--- a/laravel/controller.php
+++ b/laravel/controller.php
@@ -42,15 +42,9 @@ abstract class Controller {
 	 */
 	public function __get($key)
 	{
-		$container = IoC::container();
-
-		if ($container->registered('laravel.'.$key))
+		if (IoC::container()->registered($key))
 		{
-			return $container->resolve('laravel.'.$key);
-		}
-		elseif ($container->registered($key))
-		{
-			return $container->resolve($key);
+			return IoC::container()->resolve($key);
 		}

 		throw new \Exception("Attempting to access undefined property [$key] on controller.");