Merge pull request #8836 from HolgerW1/5.0

[5.0] Guard method onceUsingId not returning false but throwing exception
laravel · May 21, 2015 · fc7cc85 · fc7cc85
2 parents 7fb8c67 + d109800
commit fc7cc85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Illuminate/Auth/Guard.php b/src/Illuminate/Auth/Guard.php
@@ -510,9 +510,12 @@ public function loginUsingId($id, $remember = false)
 	 */
 	public function onceUsingId($id)
 	{
-		$this->setUser($this->provider->retrieveById($id));
-
-		return $this->user instanceof UserContract;
+		if ( ! is_null($user = $this->provider->retrieveById($id)))
+		{
+			$this->setUser($user);
+			return true;
+		}
+		return false;
 	}
 
 	/**

diff --git a/tests/Auth/AuthGuardTest.php b/tests/Auth/AuthGuardTest.php
@@ -246,6 +246,14 @@ public function testLoginUsingIdStoresInSessionAndLogsInWithUser()
 
 		$this->assertEquals($user, $guard->loginUsingId(10));
 	}
+
+
+	public function testOnceUsingIdFailure()
+	{
+		$guard = $this->getGuard();
+		$guard->getProvider()->shouldReceive('retrieveById')->once()->with(11)->andReturn(null);
+		$this->assertFalse($guard->onceUsingId(11));
+	}
 
 
 	public function testUserUsesRememberCookieIfItExists()