Merge pull request #220 from AfzalivE/master

Passing non-existent credentials should return null user. Thanks @AfzalivE

src/Zizaco/Confide/Confide.php

@@ -93,10 +93,6 @@ public function logAttempt( $credentials, $confirmed_only = false, $identity_col
                 array_keys($credentials),
                 array('password','remember')
             );
-            // Recheck if identity_columns are populated now
-            if (empty($identity_columns)) {
-                return false;
-           }
         }
 
         // Check for throttle limit then log-in

src/Zizaco/Confide/ConfideEloquentRepository.php

@@ -122,6 +122,10 @@ public function getUserByIdentity( $credentials, $identityColumns = array('email
                     $user = $user->orWhere($attribute, $credentials[$attribute]);        
                 }
             }            
+            else
+            {
+                return null;
+            }
         }
 
         $user = $user->get();

tests/ConfideEloquentRepositoryTest.php

@@ -162,6 +162,11 @@ public function testShouldGetByIdentity()
         $this->assertEquals(
             null, $this->repo->getUserByIdentity( array() )
         );
+
+        // When passing credentials that don't exist should return null
+        $this->assertEquals(
+            null, $this->repo->getUserByIdentity( array('token' => 'random-token-value') )
+        );
     }
 
     public function testShouldGetPasswordRemindersCountByToken()

tests/ConfideTest.php

@@ -114,13 +114,6 @@ public function testShouldLogAttempt()
         $this->assertTrue( 
             $this->confide->logAttempt( $credentials, true )
         );
-
-        unset($credentials['username']);
-        unset($credentials['email']);
-        // Should not login because there is no username or email provided
-        $this->assertFalse(
-            $this->confide->logAttempt( $credentials, true )
-        );
     }
 
     public function testShouldThrottleLogAttempt()