fix conflicts.

application/config/application.php

@@ -139,46 +139,47 @@ return array(
 	*/
 
 	'aliases' => array(
-		'Auth'       => 'Laravel\\Auth',
-		'Asset'      => 'Laravel\\Asset',
-		'Autoloader' => 'Laravel\\Autoloader',
-		'Blade'      => 'Laravel\\Blade',
-		'Bundle'     => 'Laravel\\Bundle',
-		'Cache'      => 'Laravel\\Cache',
-		'Config'     => 'Laravel\\Config',
-		'Controller' => 'Laravel\\Routing\\Controller',
-		'Cookie'     => 'Laravel\\Cookie',
-		'Crypter'    => 'Laravel\\Crypter',
-		'DB'         => 'Laravel\\Database',
-		'Eloquent'   => 'Laravel\\Database\\Eloquent\\Model',
-		'Event'      => 'Laravel\\Event',
-		'File'       => 'Laravel\\File',
-		'Filter'     => 'Laravel\\Routing\\Filter',
-		'Form'       => 'Laravel\\Form',
-		'Hash'       => 'Laravel\\Hash',
-		'HTML'       => 'Laravel\\HTML',
-		'Input'      => 'Laravel\\Input',
-		'IoC'        => 'Laravel\\IoC',
-		'Lang'       => 'Laravel\\Lang',
-		'Log'        => 'Laravel\\Log',
-		'Memcached'  => 'Laravel\\Memcached',
-		'Paginator'  => 'Laravel\\Paginator',
-		'Profiler'   => 'Laravel\\Profiling\\Profiler',
-		'URL'        => 'Laravel\\URL',
-		'Redirect'   => 'Laravel\\Redirect',
-		'Redis'      => 'Laravel\\Redis',
-		'Request'    => 'Laravel\\Request',
-		'Response'   => 'Laravel\\Response',
-		'Route'      => 'Laravel\\Routing\\Route',
-		'Router'     => 'Laravel\\Routing\\Router',
-		'Schema'     => 'Laravel\\Database\\Schema',
-		'Section'    => 'Laravel\\Section',
-		'Session'    => 'Laravel\\Session',
-		'Str'        => 'Laravel\\Str',
-		'Task'       => 'Laravel\\CLI\\Tasks\\Task',
-		'URI'        => 'Laravel\\URI',
-		'Validator'  => 'Laravel\\Validator',
-		'View'       => 'Laravel\\View',
+		'Auth'       	=> 'Laravel\\Auth',
+		'Authenticator' => 'Laravel\\Auth\\Drivers\\Driver',
+		'Asset'      	=> 'Laravel\\Asset',
+		'Autoloader' 	=> 'Laravel\\Autoloader',
+		'Blade'      	=> 'Laravel\\Blade',
+		'Bundle'     	=> 'Laravel\\Bundle',
+		'Cache'      	=> 'Laravel\\Cache',
+		'Config'     	=> 'Laravel\\Config',
+		'Controller' 	=> 'Laravel\\Routing\\Controller',
+		'Cookie'     	=> 'Laravel\\Cookie',
+		'Crypter'    	=> 'Laravel\\Crypter',
+		'DB'         	=> 'Laravel\\Database',
+		'Eloquent'   	=> 'Laravel\\Database\\Eloquent\\Model',
+		'Event'      	=> 'Laravel\\Event',
+		'File'       	=> 'Laravel\\File',
+		'Filter'     	=> 'Laravel\\Routing\\Filter',
+		'Form'       	=> 'Laravel\\Form',
+		'Hash'       	=> 'Laravel\\Hash',
+		'HTML'       	=> 'Laravel\\HTML',
+		'Input'      	=> 'Laravel\\Input',
+		'IoC'        	=> 'Laravel\\IoC',
+		'Lang'       	=> 'Laravel\\Lang',
+		'Log'        	=> 'Laravel\\Log',
+		'Memcached'  	=> 'Laravel\\Memcached',
+		'Paginator'  	=> 'Laravel\\Paginator',
+		'Profiler'  	=> 'Laravel\\Profiling\\Profiler',
+		'URL'        	=> 'Laravel\\URL',
+		'Redirect'   	=> 'Laravel\\Redirect',
+		'Redis'      	=> 'Laravel\\Redis',
+		'Request'    	=> 'Laravel\\Request',
+		'Response'   	=> 'Laravel\\Response',
+		'Route'      	=> 'Laravel\\Routing\\Route',
+		'Router'     	=> 'Laravel\\Routing\\Router',
+		'Schema'     	=> 'Laravel\\Database\\Schema',
+		'Section'    	=> 'Laravel\\Section',
+		'Session'    	=> 'Laravel\\Session',
+		'Str'        	=> 'Laravel\\Str',
+		'Task'       	=> 'Laravel\\CLI\\Tasks\\Task',
+		'URI'        	=> 'Laravel\\URI',
+		'Validator'  	=> 'Laravel\\Validator',
+		'View'       	=> 'Laravel\\View',
 	),
 
 );

laravel/auth/drivers/driver.php

@@ -5,6 +5,7 @@ use Laravel\Cookie;
 use Laravel\Config;
 use Laravel\Session;
 use Laravel\Crypter;
+use Laravel\Database\Eloquent\Model as Eloquent;
 
 abstract class Driver {
 

laravel/auth/drivers/eloquent.php

@@ -15,7 +15,30 @@ class Eloquent extends Driver {
 		if (filter_var($id, FILTER_VALIDATE_INT) !== false)
 		{
 			return $this->model()->find($id);
-		} 
+		}
+	}
+
+	/**
+	 * Login the user assigned to the given token.
+	 *
+	 * The token is typically a numeric ID for the user.
+	 *
+	 * @param  mixed   $token
+	 * @param  bool    $remember
+	 * @return bool
+	 */
+	public function login($token, $remember = false)
+	{
+		// if the token is an Eloquent model get the primary key
+		if ($token instanceof \Eloquent) $token = $token->get_key();
+
+		$this->token = $token;
+
+		$this->store($token);
+
+		if ($remember) $this->remember($token);
+
+		return true;
 	}
 
 	/**

laravel/cookie.php

@@ -44,7 +44,7 @@ class Cookie {
 	 */
 	public static function get($name, $default = null)
 	{
-		if (isset(static::$jar[$name])) return static::$jar[$name];
+		if (isset(static::$jar[$name])) return static::$jar[$name]['value'];
 
 		return array_get(Request::foundation()->cookies->all(), $name, $default);
 	}