Skip to content

Commit 3887503

Browse files
nunomaduronunomaduro
committed
Updates components
1 parent d6a45cc commit 3887503

File tree

10 files changed

+73
-41
lines changed

10 files changed

+73
-41
lines changed

‎src/Components/Http/Installer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ final class Installer extends AbstractInstaller
3535
*/
3636
public function install(): void
3737
{
38-
$this->require('guzzlehttp/guzzle "^7.5"');
39-
$this->require('illuminate/http "^10.0"');
38+
$this->require('illuminate/http "^11.5"');
4039
}
4140
}

‎src/Components/Log/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final class Installer extends AbstractInstaller
4141
*/
4242
public function install(): void
4343
{
44-
$this->require('illuminate/log "^10.0"');
44+
$this->require('illuminate/log "^11.5"');
4545

4646
$this->task(
4747
'Creating default logging configuration',

‎src/Components/Log/stubs/logging.php

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
use Monolog\Handler\NullHandler;
44
use Monolog\Handler\StreamHandler;
55
use Monolog\Handler\SyslogUdpHandler;
6+
use Monolog\Processor\PsrLogMessageProcessor;
67

78
return [
89

@@ -11,9 +12,9 @@
1112
| Default Log Channel
1213
|--------------------------------------------------------------------------
1314
|
14-
| This option defines the default log channel that gets used when writing
15-
| messages to the logs. The name specified in this option should match
16-
| one of the channels defined in the "channels" configuration array.
15+
| This option defines the default log channel that is utilized to write
16+
| messages to your logs. The value provided here should match one of
17+
| the channels present in the list of "channels" configured below.
1718
|
1819
*/
1920

@@ -30,59 +31,67 @@
3031
|
3132
*/
3233

33-
'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
34+
'deprecations' => [
35+
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
36+
'trace' => env('LOG_DEPRECATIONS_TRACE', false),
37+
],
3438

3539
/*
3640
|--------------------------------------------------------------------------
3741
| Log Channels
3842
|--------------------------------------------------------------------------
3943
|
40-
| Here you may configure the log channels for your application. Out of
41-
| the box, Laravel uses the Monolog PHP logging library. This gives
42-
| you a variety of powerful log handlers / formatters to utilize.
44+
| Here you may configure the log channels for your application. Laravel
45+
| utilizes the Monolog PHP logging library, which includes a variety
46+
| of powerful log handlers and formatters that you're free to use.
4347
|
4448
| Available Drivers: "single", "daily", "slack", "syslog",
45-
| "errorlog", "monolog",
46-
| "custom", "stack"
49+
| "errorlog", "monolog", "custom", "stack"
4750
|
4851
*/
4952

5053
'channels' => [
54+
5155
'stack' => [
5256
'driver' => 'stack',
53-
'channels' => ['stderr'],
57+
'channels' => explode(',', env('LOG_STACK', 'single')),
5458
'ignore_exceptions' => false,
5559
],
5660

5761
'single' => [
5862
'driver' => 'single',
5963
'path' => storage_path('logs/laravel.log'),
6064
'level' => env('LOG_LEVEL', 'debug'),
65+
'replace_placeholders' => true,
6166
],
6267

6368
'daily' => [
6469
'driver' => 'daily',
6570
'path' => storage_path('logs/laravel.log'),
6671
'level' => env('LOG_LEVEL', 'debug'),
67-
'days' => 14,
72+
'days' => env('LOG_DAILY_DAYS', 14),
73+
'replace_placeholders' => true,
6874
],
6975

7076
'slack' => [
7177
'driver' => 'slack',
7278
'url' => env('LOG_SLACK_WEBHOOK_URL'),
73-
'username' => 'Laravel Log',
74-
'emoji' => ':boom:',
79+
'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
80+
'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
7581
'level' => env('LOG_LEVEL', 'critical'),
82+
'replace_placeholders' => true,
7683
],
7784

7885
'papertrail' => [
7986
'driver' => 'monolog',
8087
'level' => env('LOG_LEVEL', 'debug'),
81-
'handler' => SyslogUdpHandler::class,
88+
'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
8289
'handler_with' => [
8390
'host' => env('PAPERTRAIL_URL'),
8491
'port' => env('PAPERTRAIL_PORT'),
92+
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
8593
],
94+
'processors' => [PsrLogMessageProcessor::class],
8695
],
8796

8897
'stderr' => [
@@ -93,16 +102,20 @@
93102
'with' => [
94103
'stream' => 'php://stderr',
95104
],
105+
'processors' => [PsrLogMessageProcessor::class],
96106
],
97107

98108
'syslog' => [
99109
'driver' => 'syslog',
100110
'level' => env('LOG_LEVEL', 'debug'),
111+
'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
112+
'replace_placeholders' => true,
101113
],
102114

103115
'errorlog' => [
104116
'driver' => 'errorlog',
105117
'level' => env('LOG_LEVEL', 'debug'),
118+
'replace_placeholders' => true,
106119
],
107120

108121
'null' => [
@@ -113,6 +126,7 @@
113126
'emergency' => [
114127
'path' => storage_path('logs/laravel.log'),
115128
],
129+
116130
],
117131

118132
];

‎src/Components/Logo/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final class Installer extends AbstractInstaller
4141
*/
4242
public function install(): void
4343
{
44-
$this->require('laminas/laminas-text "^2.10"');
44+
$this->require('laminas/laminas-text "^2.11"');
4545

4646
$this->task(
4747
'Creating default logo configuration',

‎src/Components/Menu/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ final class Installer extends AbstractInstaller
3535
*/
3636
public function install(): void
3737
{
38-
$this->require('nunomaduro/laravel-console-menu "^3.4"');
38+
$this->require('nunomaduro/laravel-console-menu "^3.5"');
3939
}
4040
}

‎src/Components/Queue/Installer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public function install(): void
4343
{
4444
$this->call('app:install', ['component' => 'database']);
4545

46-
$this->require('illuminate/bus "^10.0"');
47-
$this->require('illuminate/queue "^10.0"');
46+
$this->require('illuminate/bus "^11.5"');
47+
$this->require('illuminate/queue "^11.5"');
4848

4949
$this->task(
5050
'Creating default queue configuration',

‎src/Components/Queue/stubs/queue.php

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
| Default Queue Connection Name
88
|--------------------------------------------------------------------------
99
|
10-
| Laravel's queue API supports an assortment of back-ends via a single
11-
| API, giving you convenient access to each back-end using the same
12-
| syntax for every one. Here you may define a default connection.
10+
| Laravel's queue supports a variety of backends via a single, unified
11+
| API, giving you convenient access to each backend using identical
12+
| syntax for each. The default queue connection is defined below.
1313
|
1414
*/
1515

@@ -20,9 +20,9 @@
2020
| Queue Connections
2121
|--------------------------------------------------------------------------
2222
|
23-
| Here you may configure the connection information for each server that
24-
| is used by your application. A default configuration has been added
25-
| for each back-end shipped with Laravel. You are free to add more.
23+
| Here you may configure the connection options for every queue backend
24+
| used by your application. An example configuration is provided for
25+
| each backend supported by Laravel. You're also free to add more.
2626
|
2727
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
2828
|
@@ -36,17 +36,18 @@
3636

3737
'database' => [
3838
'driver' => 'database',
39-
'table' => 'jobs',
40-
'queue' => 'default',
41-
'retry_after' => 90,
39+
'connection' => env('DB_QUEUE_CONNECTION'),
40+
'table' => env('DB_QUEUE_TABLE', 'jobs'),
41+
'queue' => env('DB_QUEUE', 'default'),
42+
'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
4243
'after_commit' => false,
4344
],
4445

4546
'beanstalkd' => [
4647
'driver' => 'beanstalkd',
47-
'host' => 'localhost',
48-
'queue' => 'default',
49-
'retry_after' => 90,
48+
'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
49+
'queue' => env('BEANSTALKD_QUEUE', 'default'),
50+
'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
5051
'block_for' => 0,
5152
'after_commit' => false,
5253
],
@@ -64,29 +65,47 @@
6465

6566
'redis' => [
6667
'driver' => 'redis',
67-
'connection' => 'default',
68+
'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
6869
'queue' => env('REDIS_QUEUE', 'default'),
69-
'retry_after' => 90,
70+
'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
7071
'block_for' => null,
7172
'after_commit' => false,
7273
],
7374

7475
],
7576

77+
/*
78+
|--------------------------------------------------------------------------
79+
| Job Batching
80+
|--------------------------------------------------------------------------
81+
|
82+
| The following options configure the database and table that store job
83+
| batching information. These options can be updated to any database
84+
| connection and table which has been defined by your application.
85+
|
86+
*/
87+
88+
'batching' => [
89+
'database' => env('DB_CONNECTION', 'sqlite'),
90+
'table' => 'job_batches',
91+
],
92+
7693
/*
7794
|--------------------------------------------------------------------------
7895
| Failed Queue Jobs
7996
|--------------------------------------------------------------------------
8097
|
8198
| These options configure the behavior of failed queue job logging so you
82-
| can control which database and table are used to store the jobs that
83-
| have failed. You may change them to any database / table you wish.
99+
| can control how and where failed jobs are stored. Laravel ships with
100+
| support for storing failed jobs in a simple file or in a database.
101+
|
102+
| Supported drivers: "database-uuids", "dynamodb", "file", "null"
84103
|
85104
*/
86105

87106
'failed' => [
88107
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
89-
'database' => env('DB_CONNECTION', 'mysql'),
108+
'database' => env('DB_CONNECTION', 'sqlite'),
90109
'table' => 'failed_jobs',
91110
],
92111

‎src/Components/Redis/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ final class Installer extends AbstractInstaller
2727
/** {@inheritdoc} */
2828
public function install(): void
2929
{
30-
$this->require('illuminate/redis "^10.0"');
30+
$this->require('illuminate/redis "^11.5"');
3131
}
3232
}

‎src/Components/Updater/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ final class Installer extends AbstractInstaller
3535
*/
3636
public function install(): void
3737
{
38-
$this->require('laravel-zero/phar-updater "^1.3"');
38+
$this->require('laravel-zero/phar-updater "^1.4"');
3939
}
4040
}

‎src/Components/View/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final class Installer extends AbstractInstaller
4141
*/
4242
public function install(): void
4343
{
44-
$this->require('illuminate/view "^10.0"');
44+
$this->require('illuminate/view "^11.5"');
4545

4646
$this->task(
4747
'Creating resources/views folder',

0 commit comments

Comments
 (0)