Skip to content

Commit 0f5ffdf

Browse files
taylorotwelltaylorotwell
committed
fix conflicts.
2 parents 1a17e35 + 012663d commit 0f5ffdf

File tree

4 files changed

+67
-42
lines changed

4 files changed

+67
-42
lines changed

‎application/config/application.php

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -139,46 +139,47 @@
139139
*/
140140

141141
'aliases' => array(
142-
'Auth' => 'Laravel\\Auth',
143-
'Asset' => 'Laravel\\Asset',
144-
'Autoloader' => 'Laravel\\Autoloader',
145-
'Blade' => 'Laravel\\Blade',
146-
'Bundle' => 'Laravel\\Bundle',
147-
'Cache' => 'Laravel\\Cache',
148-
'Config' => 'Laravel\\Config',
149-
'Controller' => 'Laravel\\Routing\\Controller',
150-
'Cookie' => 'Laravel\\Cookie',
151-
'Crypter' => 'Laravel\\Crypter',
152-
'DB' => 'Laravel\\Database',
153-
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
154-
'Event' => 'Laravel\\Event',
155-
'File' => 'Laravel\\File',
156-
'Filter' => 'Laravel\\Routing\\Filter',
157-
'Form' => 'Laravel\\Form',
158-
'Hash' => 'Laravel\\Hash',
159-
'HTML' => 'Laravel\\HTML',
160-
'Input' => 'Laravel\\Input',
161-
'IoC' => 'Laravel\\IoC',
162-
'Lang' => 'Laravel\\Lang',
163-
'Log' => 'Laravel\\Log',
164-
'Memcached' => 'Laravel\\Memcached',
165-
'Paginator' => 'Laravel\\Paginator',
166-
'Profiler' => 'Laravel\\Profiling\\Profiler',
167-
'URL' => 'Laravel\\URL',
168-
'Redirect' => 'Laravel\\Redirect',
169-
'Redis' => 'Laravel\\Redis',
170-
'Request' => 'Laravel\\Request',
171-
'Response' => 'Laravel\\Response',
172-
'Route' => 'Laravel\\Routing\\Route',
173-
'Router' => 'Laravel\\Routing\\Router',
174-
'Schema' => 'Laravel\\Database\\Schema',
175-
'Section' => 'Laravel\\Section',
176-
'Session' => 'Laravel\\Session',
177-
'Str' => 'Laravel\\Str',
178-
'Task' => 'Laravel\\CLI\\Tasks\\Task',
179-
'URI' => 'Laravel\\URI',
180-
'Validator' => 'Laravel\\Validator',
181-
'View' => 'Laravel\\View',
142+
'Auth' => 'Laravel\\Auth',
143+
'Authenticator' => 'Laravel\\Auth\\Drivers\\Driver',
144+
'Asset' => 'Laravel\\Asset',
145+
'Autoloader' => 'Laravel\\Autoloader',
146+
'Blade' => 'Laravel\\Blade',
147+
'Bundle' => 'Laravel\\Bundle',
148+
'Cache' => 'Laravel\\Cache',
149+
'Config' => 'Laravel\\Config',
150+
'Controller' => 'Laravel\\Routing\\Controller',
151+
'Cookie' => 'Laravel\\Cookie',
152+
'Crypter' => 'Laravel\\Crypter',
153+
'DB' => 'Laravel\\Database',
154+
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
155+
'Event' => 'Laravel\\Event',
156+
'File' => 'Laravel\\File',
157+
'Filter' => 'Laravel\\Routing\\Filter',
158+
'Form' => 'Laravel\\Form',
159+
'Hash' => 'Laravel\\Hash',
160+
'HTML' => 'Laravel\\HTML',
161+
'Input' => 'Laravel\\Input',
162+
'IoC' => 'Laravel\\IoC',
163+
'Lang' => 'Laravel\\Lang',
164+
'Log' => 'Laravel\\Log',
165+
'Memcached' => 'Laravel\\Memcached',
166+
'Paginator' => 'Laravel\\Paginator',
167+
'Profiler' => 'Laravel\\Profiling\\Profiler',
168+
'URL' => 'Laravel\\URL',
169+
'Redirect' => 'Laravel\\Redirect',
170+
'Redis' => 'Laravel\\Redis',
171+
'Request' => 'Laravel\\Request',
172+
'Response' => 'Laravel\\Response',
173+
'Route' => 'Laravel\\Routing\\Route',
174+
'Router' => 'Laravel\\Routing\\Router',
175+
'Schema' => 'Laravel\\Database\\Schema',
176+
'Section' => 'Laravel\\Section',
177+
'Session' => 'Laravel\\Session',
178+
'Str' => 'Laravel\\Str',
179+
'Task' => 'Laravel\\CLI\\Tasks\\Task',
180+
'URI' => 'Laravel\\URI',
181+
'Validator' => 'Laravel\\Validator',
182+
'View' => 'Laravel\\View',
182183
),
183184

184185
);

‎laravel/auth/drivers/driver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Laravel\Config;
66
use Laravel\Session;
77
use Laravel\Crypter;
8+
use Laravel\Database\Eloquent\Model as Eloquent;
89

910
abstract class Driver {
1011

‎laravel/auth/drivers/eloquent.php

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,30 @@ public function retrieve($id)
1515
if (filter_var($id, FILTER_VALIDATE_INT) !== false)
1616
{
1717
return $this->model()->find($id);
18-
}
18+
}
19+
}
20+
21+
/**
22+
* Login the user assigned to the given token.
23+
*
24+
* The token is typically a numeric ID for the user.
25+
*
26+
* @param mixed $token
27+
* @param bool $remember
28+
* @return bool
29+
*/
30+
public function login($token, $remember = false)
31+
{
32+
// if the token is an Eloquent model get the primary key
33+
if ($token instanceof \Eloquent) $token = $token->get_key();
34+
35+
$this->token = $token;
36+
37+
$this->store($token);
38+
39+
if ($remember) $this->remember($token);
40+
41+
return true;
1942
}
2043

2144
/**

‎laravel/cookie.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static function has($name)
4444
*/
4545
public static function get($name, $default = null)
4646
{
47-
if (isset(static::$jar[$name])) return static::$jar[$name];
47+
if (isset(static::$jar[$name])) return static::$jar[$name]['value'];
4848

4949
return array_get(Request::foundation()->cookies->all(), $name, $default);
5050
}

0 commit comments

Comments
 (0)