Use Hash::isAcceptable to verify if hashed cast should hash the value

bastien-phi · Oct 17, 2023 · e52fc3f · e52fc3f
1 parent a53227d
commit e52fc3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -1316,7 +1316,7 @@ public static function encryptUsing($encrypter)
      */
     protected function castAttributeAsHashedString($key, $value)
     {
-        return $value !== null && Hash::needsRehash($value) ? Hash::make($value) : $value;
+        return $value !== null && ! Hash::isAcceptable($value) ? Hash::make($value) : $value;
     }
 
     /**

diff --git a/tests/Integration/Database/EloquentModelHashedCastingTest.php b/tests/Integration/Database/EloquentModelHashedCastingTest.php
@@ -30,9 +30,9 @@ protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
 
     public function testHashed()
     {
-        $this->hasher->expects('needsRehash')
+        $this->hasher->expects('isAcceptable')
             ->with('this is a password')
-            ->andReturnTrue();
+            ->andReturnFalse();
 
         $this->hasher->expects('make')
             ->with('this is a password')
@@ -49,11 +49,11 @@ public function testHashed()
         ]);
     }
 
-    public function testNotHashedIfAlreadyHashed()
+    public function testNotHashedIfAlreadyCorrectlyHashed()
     {
-        $this->hasher->expects('needsRehash')
+        $this->hasher->expects('isAcceptable')
             ->with('already-hashed-password')
-            ->andReturnFalse();
+            ->andReturnTrue();
 
         $subject = HashedCast::create([
             'password' => 'already-hashed-password',