Skip to content

Commit a30114c

Browse files
committed
feat: synchronise configuration files
1 parent 4f722a6 commit a30114c

File tree

4 files changed

+38
-8
lines changed

4 files changed

+38
-8
lines changed

src/Components/Database/stubs/database.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@
3636
'url' => env('DB_URL'),
3737
'database' => env('DB_DATABASE', database_path('database.sqlite')),
3838
'prefix' => '',
39+
'prefix_indexes' => null,
3940
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
41+
'busy_timeout' => null,
42+
'journal_mode' => null,
43+
'synchronous' => null,
44+
'transaction_mode' => 'DEFERRED',
45+
'pragmas' => [],
4046
],
4147

4248
'mysql' => [
@@ -55,7 +61,7 @@
5561
'strict' => true,
5662
'engine' => null,
5763
'options' => extension_loaded('pdo_mysql') ? array_filter([
58-
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
64+
(PHP_VERSION_ID >= 80500 ? Pdo\Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
5965
]) : [],
6066
],
6167

@@ -75,7 +81,7 @@
7581
'strict' => true,
7682
'engine' => null,
7783
'options' => extension_loaded('pdo_mysql') ? array_filter([
78-
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
84+
(PHP_VERSION_ID >= 80500 ? Pdo\Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
7985
]) : [],
8086
],
8187

@@ -144,7 +150,8 @@
144150

145151
'options' => [
146152
'cluster' => env('REDIS_CLUSTER', 'redis'),
147-
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
153+
'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_').'_database_'),
154+
'persistent' => env('REDIS_PERSISTENT', false),
148155
],
149156

150157
'default' => [
@@ -154,6 +161,10 @@
154161
'password' => env('REDIS_PASSWORD'),
155162
'port' => env('REDIS_PORT', '6379'),
156163
'database' => env('REDIS_DB', '0'),
164+
'max_retries' => env('REDIS_MAX_RETRIES', 3),
165+
'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
166+
'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
167+
'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
157168
],
158169

159170
'cache' => [
@@ -163,6 +174,10 @@
163174
'password' => env('REDIS_PASSWORD'),
164175
'port' => env('REDIS_PORT', '6379'),
165176
'database' => env('REDIS_CACHE_DB', '1'),
177+
'max_retries' => env('REDIS_MAX_RETRIES', 3),
178+
'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
179+
'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
180+
'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
166181
],
167182

168183
],

src/Components/Log/stubs/logging.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
| utilizes the Monolog PHP logging library, which includes a variety
4646
| of powerful log handlers and formatters that you're free to use.
4747
|
48-
| Available Drivers: "single", "daily", "slack", "syslog",
48+
| Available drivers: "single", "daily", "slack", "syslog",
4949
| "errorlog", "monolog", "custom", "stack"
5050
|
5151
*/
@@ -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

src/Components/Queue/stubs/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
/*

src/Components/View/stubs/view.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
return [
4+
45
'paths' => [
56
resource_path('views'),
67
],
@@ -9,4 +10,5 @@
910
'VIEW_COMPILED_PATH',
1011
realpath(storage_path('framework/views'))
1112
),
13+
1214
];

0 commit comments

Comments
 (0)