Check for null and return false

laravel · Nov 17, 2022 · 939302c · 939302c
1 parent 22c2cee
commit 939302c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/Illuminate/Hashing/AbstractHasher.php b/src/Illuminate/Hashing/AbstractHasher.php
@@ -19,13 +19,13 @@ public function info($hashedValue)
      * Check the given plain value against a hash.
      *
      * @param  string  $value
-     * @param  string  $hashedValue
+     * @param  string|null  $hashedValue
      * @param  array  $options
      * @return bool
      */
     public function check($value, $hashedValue, array $options = [])
     {
-        if (strlen($hashedValue) === 0) {
+        if (is_null($hashedValue)) {
             return false;
         }
 

diff --git a/src/Illuminate/Hashing/Argon2IdHasher.php b/src/Illuminate/Hashing/Argon2IdHasher.php
@@ -10,7 +10,7 @@ class Argon2IdHasher extends ArgonHasher
      * Check the given plain value against a hash.
      *
      * @param  string  $value
-     * @param  string  $hashedValue
+     * @param  string|null  $hashedValue
      * @param  array  $options
      * @return bool
      *
@@ -22,7 +22,7 @@ public function check($value, $hashedValue, array $options = [])
             throw new RuntimeException('This password does not use the Argon2id algorithm.');
         }
 
-        if (strlen($hashedValue) === 0) {
+        if (is_null($hashedValue)) {
             return false;
         }
 

diff --git a/tests/Hashing/HasherTest.php b/tests/Hashing/HasherTest.php
@@ -10,6 +10,26 @@
 
 class HasherTest extends TestCase
 {
+    public function testEmptyHashedValueReturnsFalse()
+    {
+        $hasher = new BcryptHasher();
+        $this->assertTrue($hasher->check('password', ''));
+        $hasher = new ArgonHasher();
+        $this->assertTrue($hasher->check('password', ''));
+        $hasher = new Argon2IdHasher();
+        $this->assertTrue($hasher->check('password', ''));
+    }
+
+    public function testNullHashedValueReturnsFalse()
+    {
+        $hasher = new BcryptHasher();
+        $this->assertTrue($hasher->check('password', null));
+        $hasher = new ArgonHasher();
+        $this->assertTrue($hasher->check('password', null));
+        $hasher = new Argon2IdHasher();
+        $this->assertTrue($hasher->check('password', null));
+    }
+
     public function testBasicBcryptHashing()
     {
         $hasher = new BcryptHasher;