Commit 495ff1b1 authored by Shawn McCool's avatar Shawn McCool

eloquent model detection moved to eloquent driver

parent 988dae24
...@@ -5,7 +5,6 @@ use Laravel\Cookie; ...@@ -5,7 +5,6 @@ use Laravel\Cookie;
use Laravel\Config; use Laravel\Config;
use Laravel\Session; use Laravel\Session;
use Laravel\Crypter; use Laravel\Crypter;
use Laravel\Database\Eloquent\Model as Eloquent;
abstract class Driver { abstract class Driver {
...@@ -107,10 +106,6 @@ abstract class Driver { ...@@ -107,10 +106,6 @@ abstract class Driver {
*/ */
public function login($token, $remember = false) 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->token = $token;
$this->store($token); $this->store($token);
......
...@@ -15,7 +15,7 @@ class Eloquent extends Driver { ...@@ -15,7 +15,7 @@ class Eloquent extends Driver {
if (filter_var($id, FILTER_VALIDATE_INT) !== false) if (filter_var($id, FILTER_VALIDATE_INT) !== false)
{ {
return $this->model()->find($id); return $this->model()->find($id);
} }
} }
/** /**
...@@ -43,6 +43,29 @@ class Eloquent extends Driver { ...@@ -43,6 +43,29 @@ class Eloquent extends Driver {
return false; 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. * Get a fresh model instance.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment