Skip to content

Commit 0db4404

Browse files
Merge pull request #193 from pushpak1300/sync-from-base-v12.9.0-20251024-205105
Sync from base: drift:v12.9.0
2 parents 2ce02d1 + de4b37e commit 0db4404

File tree

12 files changed

+26
-20
lines changed

12 files changed

+26
-20
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/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/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/services.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
'token' => env('POSTMARK_TOKEN'),
1919
],
2020

21+
'resend' => [
22+
'key' => env('RESEND_KEY'),
23+
],
24+
2125
'ses' => [
2226
'key' => env('AWS_ACCESS_KEY_ID'),
2327
'secret' => env('AWS_SECRET_ACCESS_KEY'),
2428
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
2529
],
2630

27-
'resend' => [
28-
'key' => env('RESEND_KEY'),
29-
],
30-
3131
'slack' => [
3232
'notifications' => [
3333
'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),

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
/*

0 commit comments

Comments
 (0)