Skip to content

Commit 42d86b7

Browse files
committed
drift:v12.9.0
Sync from base tag v12.9.0
1 parent 5ba5d64 commit 42d86b7

File tree

10 files changed

+21
-15
lines changed

10 files changed

+21
-15
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
@@ -13,7 +13,7 @@
1313
commands: __DIR__.'/../routes/console.php',
1414
health: '/up',
1515
)
16-
->withMiddleware(function (Middleware $middleware) {
16+
->withMiddleware(function (Middleware $middleware): void {
1717
$middleware->encryptCookies(except: ['appearance', 'sidebar_state']);
1818

1919
$middleware->web(append: [
@@ -22,6 +22,6 @@
2222
AddLinkHeadersForPreloadedAssets::class,
2323
]);
2424
})
25-
->withExceptions(function (Exceptions $exceptions) {
25+
->withExceptions(function (Exceptions $exceptions): void {
2626
//
2727
})->create();

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"require-dev": {
2020
"fakerphp/faker": "^1.23",
2121
"laravel/pail": "^1.2.2",
22-
"laravel/pint": "^1.18",
22+
"laravel/pint": "^1.24",
2323
"laravel/sail": "^1.41",
2424
"mockery/mockery": "^1.6",
2525
"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/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/session.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
| incoming requests. Laravel supports a variety of storage options to
1414
| persist session data. Database storage is a great default choice.
1515
|
16-
| Supported: "file", "cookie", "database", "apc",
17-
| "memcached", "redis", "dynamodb", "array"
16+
| Supported: "file", "cookie", "database", "memcached",
17+
| "redis", "dynamodb", "array"
1818
|
1919
*/
2020

@@ -97,7 +97,7 @@
9797
| define the cache store which should be used to store the session data
9898
| between requests. This must match one of your defined cache stores.
9999
|
100-
| Affects: "apc", "dynamodb", "memcached", "redis"
100+
| Affects: "dynamodb", "memcached", "redis"
101101
|
102102
*/
103103

@@ -129,7 +129,7 @@
129129

130130
'cookie' => env(
131131
'SESSION_COOKIE',
132-
Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
132+
Str::slug((string) env('APP_NAME', 'laravel')).'-session'
133133
),
134134

135135
/*

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json.schemastore.org/package.json",
23
"private": true,
34
"type": "module",
45
"scripts": {

phpunit.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
<env name="APP_ENV" value="testing"/>
2222
<env name="APP_MAINTENANCE_DRIVER" value="file"/>
2323
<env name="BCRYPT_ROUNDS" value="4"/>
24+
<env name="BROADCAST_CONNECTION" value="null"/>
2425
<env name="CACHE_STORE" value="array"/>
2526
<env name="DB_CONNECTION" value="sqlite"/>
2627
<env name="DB_DATABASE" value=":memory:"/>
2728
<env name="MAIL_MAILER" value="array"/>
28-
<env name="PULSE_ENABLED" value="false"/>
2929
<env name="QUEUE_CONNECTION" value="sync"/>
3030
<env name="SESSION_DRIVER" value="array"/>
31+
<env name="PULSE_ENABLED" value="false"/>
3132
<env name="TELESCOPE_ENABLED" value="false"/>
33+
<env name="NIGHTWATCH_ENABLED" value="false"/>
3234
</php>
3335
</phpunit>

0 commit comments

Comments
 (0)