Restore hard-coded config vars after Laravel v11 update

Bubka · Sep 26, 2024 · 86ee319 · 86ee319
1 parent 306ff57
commit 86ee319
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/config/auth.php b/config/auth.php
@@ -19,7 +19,8 @@
 
     'defaults' => [
         'guard' => env('AUTH_GUARD', env('AUTHENTICATION_GUARD', 'web-guard')),
-        'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
+        'passwords' => 'users',
+        // 'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
     ],
 
     /*
@@ -92,7 +93,8 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent-webauthn',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+            'model' => App\Models\User::class,
+            // 'model' => env('AUTH_MODEL', App\Models\User::class),
             // 'password_fallback' => true,
         ],
         'remote-user' => [
@@ -123,7 +125,8 @@
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_resets'),
+            'table' => 'password_resets',
+            // 'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_resets'),
             'expire' => 60,
             'throttle' => 60,
         ],

diff --git a/config/hashing.php b/config/hashing.php
@@ -30,7 +30,8 @@
 
     'bcrypt' => [
         'rounds' => env('BCRYPT_ROUNDS', 10),
-        'verify' => env('HASH_VERIFY', true),
+        'verify' => true,
+        // 'verify' => env('HASH_VERIFY', true),
     ],
 
     /*
@@ -48,7 +49,8 @@
         'memory' => env('ARGON_MEMORY', 65536),
         'threads' => env('ARGON_THREADS', 1),
         'time' => env('ARGON_TIME', 4),
-        'verify' => env('HASH_VERIFY', true),
+        'verify' => true,
+        // 'verify' => env('HASH_VERIFY', true),
     ],
 
     /*

diff --git a/config/mail.php b/config/mail.php
@@ -132,7 +132,8 @@
     */
 
     'markdown' => [
-        'theme' => env('MAIL_MARKDOWN_THEME', 'default'),
+        'theme' => 'default',
+        // 'theme' => env('MAIL_MARKDOWN_THEME', 'default'),
 
         'paths' => [
             resource_path('views/vendor/mail'),

diff --git a/config/session.php b/config/session.php
@@ -32,9 +32,11 @@
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 1 * (60 * 24 * 90)),
+    'lifetime' => 1 * (60 * 24 * 90),
+    // 'lifetime' => env('SESSION_LIFETIME', 1 * (60 * 24 * 90)),
 
-    'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
+    'expire_on_close' => false,
+    // 'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -182,7 +184,8 @@
     |
     */
 
-    'http_only' => env('SESSION_HTTP_ONLY', true),
+    'http_only' => true,
+    // 'http_only' => env('SESSION_HTTP_ONLY', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -199,7 +202,8 @@
     |
     */
 
-    'same_site' => env('SESSION_SAME_SITE', 'lax'),
+    'same_site' => 'lax',
+    // 'same_site' => env('SESSION_SAME_SITE', 'lax'),
 
     /*
     |--------------------------------------------------------------------------
@@ -212,6 +216,7 @@
     |
     */
 
-    'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
+    'partitioned' => false,
+    // 'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
 
 ];