Small tweaks.

Author: stevebauman

src/AdldapAuthUserProvider.php

@@ -50,11 +50,8 @@ public function retrieveByCredentials(array $credentials)
             // Get the input key.
             $key = key($attributes);
 
-            // Filter the query by the username attribute.
-            $query->whereEquals($attributes[$key], $credentials[$key]);
-
-            // Retrieve the first user result.
-            $user = $query->first();
+            // Filter the query by the username attribute and retrieve the first user result.
+            $user = $query->where([$attributes[$key] => $credentials[$key]])->first();
 
             // If the user is an Adldap User model instance.
             if ($user instanceof User) {
@@ -101,11 +98,9 @@ protected function discoverAdldapFromModel($model)
 
             $key = key($attributes);
 
-            $query = $this->newAdldapUserQuery();
-
-            $query->whereEquals($attributes[$key], $model->{$key});
-
-            $user = $query->first();
+            $user = $this->newAdldapUserQuery()
+                ->where([$attributes[$key] => $model->{$key}])
+                ->first();
 
             if ($user instanceof User) {
                 $model = $this->bindAdldapToModel($user, $model);

tests/AdldapTest.php

@@ -85,7 +85,7 @@ public function test_auth_passes()
 
         $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
-        $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
+        $mockedBuilder->shouldReceive('where')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('first')->once()->andReturn($adUser);
         $mockedAuth->shouldReceive('attempt')->once()->andReturn(true);
 
@@ -146,7 +146,7 @@ public function test_auth_fails()
 
         $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
-        $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
+        $mockedBuilder->shouldReceive('where')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('first')->once()->andReturn($adUser);
         $mockedAuth->shouldReceive('attempt')->once()->andReturn(false);
 
@@ -174,7 +174,7 @@ public function test_auth_fails_when_user_not_found()
         $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('getConnection')->once()->andReturn($mockedConnection);
-        $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
+        $mockedBuilder->shouldReceive('where')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('first')->once()->andReturn(null);
 
         $this->assertFalse(Auth::attempt(['email' => 'jdoe@email.com', 'password' => '12345']));
@@ -236,7 +236,7 @@ public function test_config_login_fallback()
         $mockedSearch->shouldReceive('users')->twice()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->twice()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('getConnection')->twice()->andReturn($mockedConnection);
-        $mockedSearch->shouldReceive('whereEquals')->twice()->andReturn($mockedSearch);
+        $mockedSearch->shouldReceive('where')->twice()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('first')->twice()->andReturn(null);
 
         $manager = new Manager();