From 5cc7c3a6bd797136bf5a4bd8df7a9e88becc7471 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Wed, 28 Sep 2011 21:59:54 -0500
Subject: [PATCH] refactoring.

---
 laravel/cookie.php  |  4 ++--
 laravel/facades.php | 12 ++++++------
 laravel/form.php    |  4 ++--
 laravel/input.php   |  2 +-
 laravel/laravel.php | 12 ++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/laravel/cookie.php b/laravel/cookie.php
index 7e9ab82c..3c9a832d 100644
--- a/laravel/cookie.php
+++ b/laravel/cookie.php
@@ -40,7 +40,7 @@ public function has($name)
 	 */
 	public function get($name, $default = null)
 	{
-		return Arr::get($_COOKIE, $name, $default);
+		return Arr::get($this->cookies, $name, $default);
 	}
 
 	/**
@@ -81,7 +81,7 @@ public function put($name, $value, $minutes = 0, $path = '/', $domain = null, $s
 	{
 		if (headers_sent()) return false;
 
-		if ($minutes < 0) unset($_COOKIE[$name]);
+		if ($minutes < 0) unset($this->cookies[$name]);
 
 		// Since PHP needs the cookie lifetime in seconds, we will calculate it here.
 		// A "0" lifetime means the cookie expires when the browser closes.
diff --git a/laravel/facades.php b/laravel/facades.php
index b404a97d..92923f42 100644
--- a/laravel/facades.php
+++ b/laravel/facades.php
@@ -32,12 +32,12 @@ public static function __callStatic($method, $parameters)
 
 }
 
-class Auth extends Facade { public static $resolve = 'laravel.auth'; }
-class Cookie extends Facade { public static $resolve = 'laravel.cookie'; }
+class Auth    extends Facade { public static $resolve = 'laravel.auth'; }
+class Cookie  extends Facade { public static $resolve = 'laravel.cookie'; }
 class Crypter extends Facade { public static $resolve = 'laravel.crypter'; }
-class Hasher extends Facade { public static $resolve = 'laravel.hasher'; }
-class Input extends Facade { public static $resolve = 'laravel.input'; }
+class Hasher  extends Facade { public static $resolve = 'laravel.hasher'; }
+class Input   extends Facade { public static $resolve = 'laravel.input'; }
 class Request extends Facade { public static $resolve = 'laravel.request'; }
 class Session extends Facade { public static $resolve = 'laravel.session'; }
-class URI extends Facade { public static $resolve = 'laravel.uri'; }
-class View extends Facade { public static $resolve = 'laravel.view'; }
\ No newline at end of file
+class URI     extends Facade { public static $resolve = 'laravel.uri'; }
+class View    extends Facade { public static $resolve = 'laravel.view'; }
\ No newline at end of file
diff --git a/laravel/form.php b/laravel/form.php
index 0b16f9f1..8509224a 100644
--- a/laravel/form.php
+++ b/laravel/form.php
@@ -80,7 +80,7 @@ protected static function method($method)
 	 */
 	protected static function action($action, $https)
 	{
-		$uri = IoC::container()->resolve('laravel.uri')->get();
+		$uri = IoC::container()->core('uri')->get();
 
 		return HTML::entities(URL::to(((is_null($action)) ? $uri : $action), $https));
 	}
@@ -159,7 +159,7 @@ public static function raw_token()
 			throw new \Exception("A session driver must be specified before using CSRF tokens.");			
 		}
 
-		return IoC::container()->resolve('laravel.session')->get('csrf_token');
+		return IoC::container()->core('session')->get('csrf_token');
 	}
 
 	/**
diff --git a/laravel/input.php b/laravel/input.php
index ff76e5c1..0d8ab094 100644
--- a/laravel/input.php
+++ b/laravel/input.php
@@ -116,7 +116,7 @@ public function old($key = null, $default = null)
 			throw new \Exception('A session driver must be specified in order to access old input.');
 		}
 
-		$driver = IoC::container()->resolve('laravel.session');
+		$driver = IoC::container()->core('session');
 
 		return Arr::get($driver->get(Input::old_input, array()), $key, $default);
 	}
diff --git a/laravel/laravel.php b/laravel/laravel.php
index eefb0173..9bb5e624 100644
--- a/laravel/laravel.php
+++ b/laravel/laravel.php
@@ -25,7 +25,7 @@
  */
 if (Config::get('session.driver') !== '')
 {
-	$session = $container->resolve('laravel.session.manager');
+	$session = $container->core('session.manager');
 
 	$container->instance('laravel.session', $session->payload(Config::get('session')));
 }
@@ -36,15 +36,15 @@
  * will be called with the current requst instance. If no route is found, the 404
  * response will be returned to the browser.
  */
-$request = $container->resolve('laravel.request');
+$request = $container->core('request');
 
 list($method, $uri) = array($request->method(), $request->uri());
 
-$route = $container->resolve('laravel.routing.router')->route($request, $method, $uri);
+$route = $container->core('routing.router')->route($request, $method, $uri);
 
 if ( ! is_null($route))
 {
-	$response = $container->resolve('laravel.routing.caller')->call($route);
+	$response = $container->core('routing.caller')->call($route);
 }
 else
 {
@@ -65,9 +65,9 @@
  */
 if (isset($session))
 {
-	$flash = array(Input::old_input => $container->resolve('laravel.input')->get());
+	$flash = array(Input::old_input => $container->core('input')->get());
 
-	$session->close($container->resolve('laravel.session'), Config::get('session'), $flash);
+	$session->close($container->core('session'), Config::get('session'), $flash);
 }
 
 /**