[5.6] Allow array/collections in Auth::attempt method (#24620)

* Allow array/collections in Auth::attempt method

* style ci changes

* added use statement

* Minor changes

* style ci

Author: VinceG

src/Illuminate/Auth/DatabaseUserProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
@@ -110,7 +111,13 @@ public function retrieveByCredentials(array $credentials)
         $query = $this->conn->table($this->table);
 
         foreach ($credentials as $key => $value) {
-            if (! Str::contains($key, 'password')) {
+            if (Str::contains($key, 'password')) {
+                continue;
+            }
+
+            if (is_array($value) || $value instanceof Arrayable) {
+                $query->whereIn($key, $value);
+            } else {
                 $query->where($key, $value);
             }
         }

src/Illuminate/Auth/EloquentUserProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 
@@ -113,7 +114,13 @@ public function retrieveByCredentials(array $credentials)
         $query = $this->createModel()->newQuery();
 
         foreach ($credentials as $key => $value) {
-            if (! Str::contains($key, 'password')) {
+            if (Str::contains($key, 'password')) {
+                continue;
+            }
+
+            if (is_array($value) || $value instanceof Arrayable) {
+                $query->whereIn($key, $value);
+            } else {
                 $query->where($key, $value);
             }
         }

tests/Auth/AuthGuardTest.php

@@ -66,6 +66,18 @@ public function testBasicWithExtraConditions()
         $guard->basic('email', ['active' => 1]);
     }
 
+    public function testBasicWithExtraArrayConditions()
+    {
+        list($session, $provider, $request, $cookie) = $this->getMocks();
+        $guard = m::mock('Illuminate\Auth\SessionGuard[check,attempt]', ['default', $provider, $session]);
+        $guard->shouldReceive('check')->once()->andReturn(false);
+        $guard->shouldReceive('attempt')->once()->with(['email' => '[email protected]', 'password' => 'secret', 'active' => 1, 'type' => [1, 2, 3]])->andReturn(true);
+        $request = \Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => '[email protected]', 'PHP_AUTH_PW' => 'secret']);
+        $guard->setRequest($request);
+
+        $guard->basic('email', ['active' => 1, 'type' => [1, 2, 3]]);
+    }
+
     public function testAttemptCallsRetrieveByCredentials()
     {
         $guard = $this->getGuard();