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

eloquent model detection moved to eloquent driver

This commit is contained in:
Shawn McCool 2012-05-28 10:44:22 +02:00
parent 988dae2488
commit 495ff1b197
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
laravel/auth/drivers/driver.php
View File

@ -5,7 +5,6 @@
use Laravel\Config;
use Laravel\Session;
use Laravel\Crypter;
use Laravel\Database\Eloquent\Model as Eloquent;
abstract class Driver {
@ -107,10 +106,6 @@ abstract public function attempt($arguments = array());
*/
public function login($token, $remember = false)
{
// if the token is an Eloquent model
// set the token from the id field
if ($token instanceof Eloquent) $token = $token->get_key();
$this->token = $token;
$this->store($token);

25
laravel/auth/drivers/eloquent.php
View File

@ -15,7 +15,7 @@ public function retrieve($id)
if (filter_var($id, FILTER_VALIDATE_INT) !== false)
{
return $this->model()->find($id);
}
}
}
/**
@ -43,6 +43,29 @@ public function attempt($arguments = array())
return false;
}
/**
* 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;
}
/**
* Get a fresh model instance.
*