浏览代码

update config

3.x
Andrew Wallo 1 个月前
父节点
当前提交
05cdda6a01
共有 10 个文件被更改,包括 53 次插入26 次删除
  1. 1
    1
      config/app.php
  2. 1
    1
      config/auth.php
  3. 5
    4
      config/cache.php
  4. 5
    1
      config/database.php
  5. 6
    2
      config/filesystems.php
  6. 4
    4
      config/logging.php
  7. 18
    3
      config/mail.php
  8. 4
    4
      config/queue.php
  9. 4
    0
      config/services.php
  10. 5
    6
      config/session.php

+ 1
- 1
config/app.php 查看文件

@@ -101,7 +101,7 @@ return [
101 101
 
102 102
     'previous_keys' => [
103 103
         ...array_filter(
104
-            explode(',', env('APP_PREVIOUS_KEYS', ''))
104
+            explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
105 105
         ),
106 106
     ],
107 107
 

+ 1
- 1
config/auth.php 查看文件

@@ -104,7 +104,7 @@ return [
104 104
     | Password Confirmation Timeout
105 105
     |--------------------------------------------------------------------------
106 106
     |
107
-    | Here you may define the amount of seconds before a password confirmation
107
+    | Here you may define the number of seconds before a password confirmation
108 108
     | window expires and users are asked to re-enter their password via the
109 109
     | confirmation screen. By default, the timeout lasts for three hours.
110 110
     |

+ 5
- 4
config/cache.php 查看文件

@@ -26,7 +26,7 @@ return [
26 26
     | well as their drivers. You may even define multiple stores for the
27 27
     | same cache driver to group types of items stored in your caches.
28 28
     |
29
-    | Supported drivers: "apc", "array", "database", "file", "memcached",
29
+    | Supported drivers: "array", "database", "file", "memcached",
30 30
     |                    "redis", "dynamodb", "octane", "null"
31 31
     |
32 32
     */
@@ -40,9 +40,10 @@ return [
40 40
 
41 41
         'database' => [
42 42
             'driver' => 'database',
43
+            'connection' => env('DB_CACHE_CONNECTION'),
43 44
             'table' => env('DB_CACHE_TABLE', 'cache'),
44
-            'connection' => env('DB_CACHE_CONNECTION', null),
45
-            'lock_connection' => env('DB_CACHE_LOCK_CONNECTION', null),
45
+            'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
46
+            'lock_table' => env('DB_CACHE_LOCK_TABLE'),
46 47
         ],
47 48
 
48 49
         'file' => [
@@ -102,6 +103,6 @@ return [
102 103
     |
103 104
     */
104 105
 
105
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'),
106
+    'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')) . '-cache-'),
106 107
 
107 108
 ];

+ 5
- 1
config/database.php 查看文件

@@ -37,6 +37,9 @@ return [
37 37
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
38 38
             'prefix' => '',
39 39
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
40
+            'busy_timeout' => null,
41
+            'journal_mode' => null,
42
+            'synchronous' => null,
40 43
         ],
41 44
 
42 45
         'mysql' => [
@@ -144,7 +147,8 @@ return [
144 147
 
145 148
         'options' => [
146 149
             'cluster' => env('REDIS_CLUSTER', 'redis'),
147
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
150
+            'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')) . '-database-'),
151
+            'persistent' => env('REDIS_PERSISTENT', false),
148 152
         ],
149 153
 
150 154
         'default' => [

+ 6
- 2
config/filesystems.php 查看文件

@@ -24,7 +24,7 @@ return [
24 24
     | may even configure multiple disks for the same driver. Examples for
25 25
     | most supported storage drivers are configured here for reference.
26 26
     |
27
-    | Supported Drivers: "local", "ftp", "sftp", "s3"
27
+    | Supported drivers: "local", "ftp", "sftp", "s3"
28 28
     |
29 29
     */
30 30
 
@@ -32,8 +32,10 @@ return [
32 32
 
33 33
         'local' => [
34 34
             'driver' => 'local',
35
-            'root' => storage_path('app'),
35
+            'root' => storage_path('app/private'),
36
+            'serve' => true,
36 37
             'throw' => false,
38
+            'report' => false,
37 39
         ],
38 40
 
39 41
         'public' => [
@@ -42,6 +44,7 @@ return [
42 44
             'url' => env('APP_URL') . '/storage',
43 45
             'visibility' => 'public',
44 46
             'throw' => false,
47
+            'report' => false,
45 48
         ],
46 49
 
47 50
         's3' => [
@@ -54,6 +57,7 @@ return [
54 57
             'endpoint' => env('AWS_ENDPOINT'),
55 58
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
56 59
             'throw' => false,
60
+            'report' => false,
57 61
         ],
58 62
 
59 63
     ],

+ 4
- 4
config/logging.php 查看文件

@@ -45,7 +45,7 @@ return [
45 45
     | utilizes the Monolog PHP logging library, which includes a variety
46 46
     | of powerful log handlers and formatters that you're free to use.
47 47
     |
48
-    | Available Drivers: "single", "daily", "slack", "syslog",
48
+    | Available drivers: "single", "daily", "slack", "syslog",
49 49
     |                    "errorlog", "monolog", "custom", "stack"
50 50
     |
51 51
     */
@@ -54,7 +54,7 @@ return [
54 54
 
55 55
         'stack' => [
56 56
             'driver' => 'stack',
57
-            'channels' => explode(',', env('LOG_STACK', 'single')),
57
+            'channels' => explode(',', (string) env('LOG_STACK', 'single')),
58 58
             'ignore_exceptions' => false,
59 59
         ],
60 60
 
@@ -98,10 +98,10 @@ return [
98 98
             'driver' => 'monolog',
99 99
             'level' => env('LOG_LEVEL', 'debug'),
100 100
             'handler' => StreamHandler::class,
101
-            'formatter' => env('LOG_STDERR_FORMATTER'),
102
-            'with' => [
101
+            'handler_with' => [
103 102
                 'stream' => 'php://stderr',
104 103
             ],
104
+            'formatter' => env('LOG_STDERR_FORMATTER'),
105 105
             'processors' => [PsrLogMessageProcessor::class],
106 106
         ],
107 107
 

+ 18
- 3
config/mail.php 查看文件

@@ -30,7 +30,8 @@ return [
30 30
     | your mailers below. You may also add additional mailers if needed.
31 31
     |
32 32
     | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
33
-    |            "postmark", "log", "array", "failover", "roundrobin"
33
+    |            "postmark", "resend", "log", "array",
34
+    |            "failover", "roundrobin"
34 35
     |
35 36
     */
36 37
 
@@ -38,14 +39,14 @@ return [
38 39
 
39 40
         'smtp' => [
40 41
             'transport' => 'smtp',
42
+            'scheme' => env('MAIL_SCHEME'),
41 43
             'url' => env('MAIL_URL'),
42 44
             'host' => env('MAIL_HOST', '127.0.0.1'),
43 45
             'port' => env('MAIL_PORT', 2525),
44
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
45 46
             'username' => env('MAIL_USERNAME'),
46 47
             'password' => env('MAIL_PASSWORD'),
47 48
             'timeout' => null,
48
-            'local_domain' => env('MAIL_EHLO_DOMAIN'),
49
+            'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
49 50
         ],
50 51
 
51 52
         'ses' => [
@@ -60,6 +61,10 @@ return [
60 61
             // ],
61 62
         ],
62 63
 
64
+        'resend' => [
65
+            'transport' => 'resend',
66
+        ],
67
+
63 68
         'sendmail' => [
64 69
             'transport' => 'sendmail',
65 70
             'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
@@ -80,6 +85,16 @@ return [
80 85
                 'smtp',
81 86
                 'log',
82 87
             ],
88
+            'retry_after' => 60,
89
+        ],
90
+
91
+        'roundrobin' => [
92
+            'transport' => 'roundrobin',
93
+            'mailers' => [
94
+                'ses',
95
+                'postmark',
96
+            ],
97
+            'retry_after' => 60,
83 98
         ],
84 99
 
85 100
     ],

+ 4
- 4
config/queue.php 查看文件

@@ -36,10 +36,10 @@ return [
36 36
 
37 37
         'database' => [
38 38
             'driver' => 'database',
39
-            'connection' => env('DB_QUEUE_CONNECTION', null),
39
+            'connection' => env('DB_QUEUE_CONNECTION'),
40 40
             'table' => env('DB_QUEUE_TABLE', 'jobs'),
41 41
             'queue' => env('DB_QUEUE', 'default'),
42
-            'retry_after' => env('DB_QUEUE_RETRY_AFTER', 90),
42
+            'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
43 43
             'after_commit' => true,
44 44
         ],
45 45
 
@@ -47,7 +47,7 @@ return [
47 47
             'driver' => 'beanstalkd',
48 48
             'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
49 49
             'queue' => env('BEANSTALKD_QUEUE', 'default'),
50
-            'retry_after' => env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
50
+            'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
51 51
             'block_for' => 0,
52 52
             'after_commit' => true,
53 53
         ],
@@ -67,7 +67,7 @@ return [
67 67
             'driver' => 'redis',
68 68
             'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
69 69
             'queue' => env('REDIS_QUEUE', 'default'),
70
-            'retry_after' => env('REDIS_QUEUE_RETRY_AFTER', 90),
70
+            'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
71 71
             'block_for' => null,
72 72
             'after_commit' => true,
73 73
         ],

+ 4
- 0
config/services.php 查看文件

@@ -18,6 +18,10 @@ return [
18 18
         'token' => env('POSTMARK_TOKEN'),
19 19
     ],
20 20
 
21
+    'resend' => [
22
+        'key' => env('RESEND_KEY'),
23
+    ],
24
+
21 25
     'ses' => [
22 26
         'key' => env('AWS_ACCESS_KEY_ID'),
23 27
         'secret' => env('AWS_SECRET_ACCESS_KEY'),

+ 5
- 6
config/session.php 查看文件

@@ -13,8 +13,8 @@ return [
13 13
     | incoming requests. Laravel supports a variety of storage options to
14 14
     | persist session data. Database storage is a great default choice.
15 15
     |
16
-    | Supported: "file", "cookie", "database", "apc",
17
-    |            "memcached", "redis", "dynamodb", "array"
16
+    | Supported: "file", "cookie", "database", "memcached",
17
+    |            "redis", "dynamodb", "array"
18 18
     |
19 19
     */
20 20
 
@@ -32,7 +32,7 @@ return [
32 32
     |
33 33
     */
34 34
 
35
-    'lifetime' => env('SESSION_LIFETIME', 120),
35
+    'lifetime' => (int) env('SESSION_LIFETIME', 120),
36 36
 
37 37
     'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
38 38
 
@@ -97,7 +97,7 @@ return [
97 97
     | define the cache store which should be used to store the session data
98 98
     | between requests. This must match one of your defined cache stores.
99 99
     |
100
-    | Affects: "apc", "dynamodb", "memcached", "redis"
100
+    | Affects: "dynamodb", "memcached", "redis"
101 101
     |
102 102
     */
103 103
 
@@ -125,12 +125,11 @@ return [
125 125
     | the framework. Typically, you should not need to change this value
126 126
     | since doing so does not grant a meaningful security improvement.
127 127
     |
128
-    |
129 128
     */
130 129
 
131 130
     'cookie' => env(
132 131
         'SESSION_COOKIE',
133
-        Str::slug(env('APP_NAME', 'laravel'), '_') . '_session'
132
+        Str::slug(env('APP_NAME', 'laravel')) . '-session'
134 133
     ),
135 134
 
136 135
     /*

正在加载...
取消
保存