Added check for nullable variables

vinkla · Mar 1, 2018 · 4c37c24 · 4c37c24
1 parent 8dc1803
commit 4c37c24
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.4.1 (released 2018-03-01)
+
+- Added check for nullable variables
+
 ## 2.4.0 (released 2018-02-08)
 
 - Added laravel 5.6 support

diff --git a/src/Shield.php b/src/Shield.php
@@ -61,16 +61,18 @@ public function __construct(array $users = [])
      */
     public function verify(string $username = null, string $password = null, string $user = null)
     {
-        $users = $this->getUsers($user);
+        if ($username && $password) {
+            $users = $this->getUsers($user);
 
-        foreach ($users as $user => $credentials) {
-            if (
-                password_verify($username, reset($credentials)) &&
-                password_verify($password, end($credentials))
-            ) {
-                $this->currentUser = $user;
+            foreach ($users as $user => $credentials) {
+                if (
+                    password_verify($username, reset($credentials)) &&
+                    password_verify($password, end($credentials))
+                ) {
+                    $this->currentUser = $user;
 
-                return;
+                    return;
+                }
             }
         }