Skip to content

Commit 0d2d976

Browse files
committed
drift:v12.9.0
Sync from base tag v12.9.0
1 parent 409c244 commit 0d2d976

File tree

14 files changed

+51
-23
lines changed

14 files changed

+51
-23
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ trim_trailing_whitespace = false
1414
[*.{yml,yaml}]
1515
indent_size = 2
1616

17-
[docker-compose.yml]
17+
[compose.yaml]
1818
indent_size = 4

bootstrap/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
commands: __DIR__.'/../routes/console.php',
1313
health: '/up',
1414
)
15-
->withMiddleware(function (Middleware $middleware) {
15+
->withMiddleware(function (Middleware $middleware): void {
1616
$middleware->web(append: [
1717
HandleInertiaRequests::class,
1818
AddLinkHeadersForPreloadedAssets::class,
1919
]);
2020
})
21-
->withExceptions(function (Exceptions $exceptions) {
21+
->withExceptions(function (Exceptions $exceptions): void {
2222
//
2323
})->create();

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require-dev": {
1919
"fakerphp/faker": "^1.23",
2020
"laravel/pail": "^1.2.2",
21-
"laravel/pint": "^1.18",
21+
"laravel/pint": "^1.24",
2222
"laravel/sail": "^1.41",
2323
"mockery/mockery": "^1.6",
2424
"nunomaduro/collision": "^8.6",

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101

102102
'previous_keys' => [
103103
...array_filter(
104-
explode(',', env('APP_PREVIOUS_KEYS', ''))
104+
explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
105105
),
106106
],
107107

config/auth.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
| Password Confirmation Timeout
105105
|--------------------------------------------------------------------------
106106
|
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
108108
| window expires and users are asked to re-enter their password via the
109109
| confirmation screen. By default, the timeout lasts for three hours.
110110
|

config/cache.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
| same cache driver to group types of items stored in your caches.
2828
|
2929
| Supported drivers: "array", "database", "file", "memcached",
30-
| "redis", "dynamodb", "octane", "null"
30+
| "redis", "dynamodb", "octane",
31+
| "failover", "null"
3132
|
3233
*/
3334

@@ -90,6 +91,14 @@
9091
'driver' => 'octane',
9192
],
9293

94+
'failover' => [
95+
'driver' => 'failover',
96+
'stores' => [
97+
'database',
98+
'array',
99+
],
100+
],
101+
93102
],
94103

95104
/*
@@ -103,6 +112,6 @@
103112
|
104113
*/
105114

106-
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
115+
'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-cache-'),
107116

108117
];

config/database.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
'busy_timeout' => null,
4141
'journal_mode' => null,
4242
'synchronous' => null,
43+
'transaction_mode' => 'DEFERRED',
4344
],
4445

4546
'mysql' => [
@@ -147,7 +148,7 @@
147148

148149
'options' => [
149150
'cluster' => env('REDIS_CLUSTER', 'redis'),
150-
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
151+
'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-database-'),
151152
'persistent' => env('REDIS_PERSISTENT', false),
152153
],
153154

config/logging.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
'stack' => [
5656
'driver' => 'stack',
57-
'channels' => explode(',', env('LOG_STACK', 'single')),
57+
'channels' => explode(',', (string) env('LOG_STACK', 'single')),
5858
'ignore_exceptions' => false,
5959
],
6060

@@ -98,10 +98,10 @@
9898
'driver' => 'monolog',
9999
'level' => env('LOG_LEVEL', 'debug'),
100100
'handler' => StreamHandler::class,
101-
'formatter' => env('LOG_STDERR_FORMATTER'),
102-
'with' => [
101+
'handler_with' => [
103102
'stream' => 'php://stderr',
104103
],
104+
'formatter' => env('LOG_STDERR_FORMATTER'),
105105
'processors' => [PsrLogMessageProcessor::class],
106106
],
107107

config/mail.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
'username' => env('MAIL_USERNAME'),
4747
'password' => env('MAIL_PASSWORD'),
4848
'timeout' => null,
49-
'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
49+
'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
5050
],
5151

5252
'ses' => [
@@ -85,6 +85,7 @@
8585
'smtp',
8686
'log',
8787
],
88+
'retry_after' => 60,
8889
],
8990

9091
'roundrobin' => [
@@ -93,6 +94,7 @@
9394
'ses',
9495
'postmark',
9596
],
97+
'retry_after' => 60,
9698
],
9799

98100
],

config/queue.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
| used by your application. An example configuration is provided for
2525
| each backend supported by Laravel. You're also free to add more.
2626
|
27-
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
27+
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis",
28+
| "deferred", "failover", "null"
2829
|
2930
*/
3031

@@ -72,6 +73,18 @@
7273
'after_commit' => false,
7374
],
7475

76+
'deferred' => [
77+
'driver' => 'deferred',
78+
],
79+
80+
'failover' => [
81+
'driver' => 'failover',
82+
'connections' => [
83+
'database',
84+
'deferred',
85+
],
86+
],
87+
7588
],
7689

7790
/*

0 commit comments

Comments
 (0)