formatting

config/hashing.php

@@ -31,7 +31,7 @@
     'bcrypt' => [
         'rounds' => env('BCRYPT_ROUNDS', 12),
         'verify' => env('HASH_VERIFY', true),
-        'limit_length' => env('BCRYPT_LIMIT_LENGTH', true),
+        'limit' => env('BCRYPT_LIMIT', 72),
     ],
 
     /*

src/Illuminate/Hashing/BcryptHasher.php

@@ -4,17 +4,11 @@
 
 use Error;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
+use InvalidArgumentException;
 use RuntimeException;
 
 class BcryptHasher extends AbstractHasher implements HasherContract
 {
-    /**
-     * The maximum byte length of the value to hash.
-     *
-     * @var int
-     */
-    const MAX_BYTE_LENGTH = 72;
-
     /**
      * The default cost factor.
      *
@@ -30,11 +24,11 @@ class BcryptHasher extends AbstractHasher implements HasherContract
     protected $verifyAlgorithm = false;
 
     /**
-     * Impose bcrypt byte limit.
+     * The maximum allowed length of strings that can be hashed.
      *
-     * @var bool
+     * @var int|null
      */
-    protected $limitLength = false;
+    protected $limit;
 
     /**
      * Create a new hasher instance.
@@ -46,7 +40,7 @@ public function __construct(array $options = [])
     {
         $this->rounds = $options['rounds'] ?? $this->rounds;
         $this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;
-        $this->limitLength = $options['limit_length'] ?? $this->limitLength;
+        $this->limit = $options['limit'] ?? $this->limit;
     }
 
     /**
@@ -61,8 +55,8 @@ public function __construct(array $options = [])
     public function make(#[\SensitiveParameter] $value, array $options = [])
     {
         try {
-            if ($this->limitLength && strlen($value) > self::MAX_BYTE_LENGTH) {
-                throw new BcryptValueTooLongException;
+            if ($this->limit && strlen($value) > $this->limit) {
+                throw new InvalidArgumentException('Value is too long to hash. Value must be less than '.$this->limit.' bytes.');
             }
 
             $hash = password_hash($value, PASSWORD_BCRYPT, [

tests/Hashing/HasherTest.php

@@ -62,8 +62,8 @@ public function testBasicBcryptHashing()
 
     public function testBcryptValueTooLong()
     {
-        $this->expectException(BcryptValueTooLongException::class);
-        $hasher = new BcryptHasher(['limit_length' => true]);
+        $this->expectException(\InvalidArgumentException::class);
+        $hasher = new BcryptHasher(['limit' => 72]);
         $hasher->make(str_repeat('a', 73));
     }