[5.x] Alternate Laravel 12 token repository fix (#11505)

statamic · Feb 26, 2025 · dd8f37b · dd8f37b
1 parent da24318
commit dd8f37b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 114 deletions.
diff --git a/src/Auth/Passwords/LaravelTwelveTokenRepository.php b/src/Auth/Passwords/LaravelTwelveTokenRepository.php
diff --git a/src/Auth/Passwords/PasswordBrokerManager.php b/src/Auth/Passwords/PasswordBrokerManager.php
@@ -15,23 +15,12 @@ protected function createTokenRepository(array $config)
             $key = base64_decode(substr($key, 7));
         }
 
-        if (version_compare(app()->version(), '12', '<')) {
-            return new TokenRepository(
-                $this->app['files'],
-                $this->app['hash'],
-                $config['table'],
-                $key,
-                $config['expire'],
-                $config['throttle'] ?? 0
-            );
-        }
-
-        return new LaravelTwelveTokenRepository(
+        return new TokenRepository(
             $this->app['files'],
             $this->app['hash'],
             $config['table'],
             $key,
-            ($config['expire'] ?? 60) * 60,
+            $config['expire'],
             $config['throttle'] ?? 0
         );
     }

diff --git a/src/Auth/Passwords/TokenRepository.php b/src/Auth/Passwords/TokenRepository.php
@@ -12,9 +12,6 @@
 class TokenRepository extends DatabaseTokenRepository
 {
     protected $files;
-    protected $hasher;
-    protected $hashKey;
-    protected $expires;
     protected $path;
 
     public function __construct(Filesystem $files, HasherContract $hasher, $table, $hashKey, $expires = 60, $throttle = 60)