Skip to content

Commit 928b719

Browse files
committed
upgrade laravel v11.36.1
1 parent 36d56e6 commit 928b719

14 files changed

+66
-32
lines changed

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.{ts,js,vue}]
14+
[*.{yml,yaml}]
1515
indent_size = 2
16+
17+
[docker-compose.yml]
18+
indent_size = 4

.env.example

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ AUTH_GUARD=api
2222
APP_MAINTENANCE_DRIVER=file
2323
APP_MAINTENANCE_STORE=database
2424

25+
PHP_CLI_SERVER_WORKERS=4
26+
2527
BCRYPT_ROUNDS=12
2628

2729
LOG_CHANNEL=stack
@@ -57,11 +59,11 @@ REDIS_PASSWORD=null
5759
REDIS_PORT=6379
5860

5961
MAIL_MAILER=log
62+
MAIL_SCHEME=null
6063
MAIL_HOST=127.0.0.1
6164
MAIL_PORT=2525
6265
MAIL_USERNAME=null
6366
MAIL_PASSWORD=null
64-
MAIL_ENCRYPTION=null
6567
MAIL_FROM_ADDRESS="[email protected]"
6668
MAIL_FROM_NAME="${APP_NAME}"
6769

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
/public/build
44
/public/hot
55
/public/storage
6+
/public/vendor
67
/public/.well-known
78
/storage/*.key
9+
/storage/pail
810
/vendor
9-
/public/vendor
1011
.env
1112
.env.backup
1213
.env.production
14+
.phpactor.json
1315
.phpunit.result.cache
1416
Homestead.json
1517
Homestead.yaml
@@ -18,8 +20,10 @@ npm-debug.log
1820
yarn-error.log
1921
/.fleet
2022
/.idea
23+
/.nova
2124
/.vscode/*
2225
!/.vscode/settings.json
26+
/.zed
2327

2428
# Nuxt dev/build outputs
2529
.output

composer.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{
2+
"$schema": "https://getcomposer.org/schema.json",
23
"name": "laravel/laravel",
34
"type": "project",
45
"description": "The skeleton application for the Laravel framework.",
5-
"keywords": [
6-
"laravel",
7-
"framework"
8-
],
6+
"keywords": ["laravel", "framework"],
97
"license": "MIT",
108
"require": {
119
"php": "^8.2",
1210
"intervention/image": "^3.4",
13-
"laravel/framework": "^11.0",
11+
"laravel/framework": "^11.31",
1412
"laravel/octane": "^2.3",
1513
"laravel/sanctum": "^4.0",
1614
"laravel/socialite": "^5.12",
@@ -23,13 +21,13 @@
2321
"roave/security-advisories": "dev-latest",
2422
"barryvdh/laravel-ide-helper": "^3.0",
2523
"fakerphp/faker": "^1.23",
26-
"laravel/pint": "^1.14",
27-
"laravel/sail": "^1.29",
24+
"laravel/pail": "^1.1",
25+
"laravel/pint": "^1.13",
26+
"laravel/sail": "^1.26",
2827
"laravel/telescope": "^5.0",
2928
"mockery/mockery": "^1.6",
30-
"nunomaduro/collision": "^8.0",
31-
"phpunit/phpunit": "^10.5",
32-
"spatie/laravel-ignition": "^2.4"
29+
"nunomaduro/collision": "^8.1",
30+
"phpunit/phpunit": "^11.0.1"
3331
},
3432
"autoload": {
3533
"psr-4": {
@@ -58,6 +56,10 @@
5856
"@php artisan key:generate --ansi",
5957
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
6058
"@php artisan migrate --graceful --ansi"
59+
],
60+
"dev": [
61+
"Composer\\Config::disableProcessTimeout",
62+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
6163
]
6264
},
6365
"extra": {

config/cache.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
| well as their drivers. You may even define multiple stores for the
2727
| same cache driver to group types of items stored in your caches.
2828
|
29-
| Supported drivers: "apc", "array", "database", "file", "memcached",
29+
| Supported drivers: "array", "database", "file", "memcached",
3030
| "redis", "dynamodb", "octane", "null"
3131
|
3232
*/
@@ -40,9 +40,10 @@
4040

4141
'database' => [
4242
'driver' => 'database',
43+
'connection' => env('DB_CACHE_CONNECTION'),
4344
'table' => env('DB_CACHE_TABLE', 'cache'),
44-
'connection' => env('DB_CACHE_CONNECTION', null),
45-
'lock_connection' => env('DB_CACHE_LOCK_CONNECTION', null),
45+
'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
46+
'lock_table' => env('DB_CACHE_LOCK_TABLE'),
4647
],
4748

4849
'file' => [

config/database.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
'database' => env('DB_DATABASE', database_path('database.sqlite')),
3838
'prefix' => '',
3939
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
40+
'busy_timeout' => null,
41+
'journal_mode' => null,
42+
'synchronous' => null,
4043
],
4144

4245
'mysql' => [
@@ -49,7 +52,7 @@
4952
'password' => env('DB_PASSWORD', ''),
5053
'unix_socket' => env('DB_SOCKET', ''),
5154
'charset' => env('DB_CHARSET', 'utf8mb4'),
52-
'collation' => env('DB_COLLATION', 'utf8mb4_0900_ai_ci'),
55+
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
5356
'prefix' => '',
5457
'prefix_indexes' => true,
5558
'strict' => true,

config/filesystems.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
| may even configure multiple disks for the same driver. Examples for
2525
| most supported storage drivers are configured here for reference.
2626
|
27-
| Supported Drivers: "local", "ftp", "sftp", "s3"
27+
| Supported drivers: "local", "ftp", "sftp", "s3"
2828
|
2929
*/
3030

3131
'disks' => [
3232

3333
'local' => [
3434
'driver' => 'local',
35-
'root' => storage_path('app'),
35+
'root' => storage_path('app/private'),
36+
'serve' => true,
3637
'throw' => false,
3738
],
3839

config/logging.php

Lines changed: 1 addition & 1 deletion
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
*/

config/mail.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,23 @@
3030
| your mailers below. You may also add additional mailers if needed.
3131
|
3232
| Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
33-
| "postmark", "log", "array", "failover", "roundrobin"
33+
| "postmark", "resend", "log", "array",
34+
| "failover", "roundrobin"
3435
|
3536
*/
3637

3738
'mailers' => [
3839

3940
'smtp' => [
4041
'transport' => 'smtp',
42+
'scheme' => env('MAIL_SCHEME'),
4143
'url' => env('MAIL_URL'),
4244
'host' => env('MAIL_HOST', '127.0.0.1'),
4345
'port' => env('MAIL_PORT', 2525),
44-
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
4546
'username' => env('MAIL_USERNAME'),
4647
'password' => env('MAIL_PASSWORD'),
4748
'timeout' => null,
48-
'local_domain' => env('MAIL_EHLO_DOMAIN'),
49+
'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
4950
],
5051

5152
'ses' => [
@@ -60,6 +61,10 @@
6061
// ],
6162
],
6263

64+
'resend' => [
65+
'transport' => 'resend',
66+
],
67+
6368
'sendmail' => [
6469
'transport' => 'sendmail',
6570
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
@@ -82,6 +87,14 @@
8287
],
8388
],
8489

90+
'roundrobin' => [
91+
'transport' => 'roundrobin',
92+
'mailers' => [
93+
'ses',
94+
'postmark',
95+
],
96+
],
97+
8598
],
8699

87100
/*

config/octane.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Laravel\Octane\Events\WorkerErrorOccurred;
1212
use Laravel\Octane\Events\WorkerStarting;
1313
use Laravel\Octane\Events\WorkerStopping;
14+
use Laravel\Octane\Listeners\CloseMonologHandlers;
1415
use Laravel\Octane\Listeners\CollectGarbage;
1516
use Laravel\Octane\Listeners\DisconnectFromDatabases;
1617
use Laravel\Octane\Listeners\EnsureUploadedFilesAreValid;
@@ -116,7 +117,7 @@
116117
],
117118

118119
WorkerStopping::class => [
119-
//
120+
CloseMonologHandlers::class,
120121
],
121122
],
122123

@@ -187,8 +188,8 @@
187188
'watch' => [
188189
'app',
189190
'bootstrap',
190-
'config',
191-
'database',
191+
'config/**/*.php',
192+
'database/**/*.php',
192193
'public/**/*.php',
193194
'resources/**/*.php',
194195
'routes',

config/queue.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@
3636

3737
'database' => [
3838
'driver' => 'database',
39-
'connection' => env('DB_QUEUE_CONNECTION', null),
39+
'connection' => env('DB_QUEUE_CONNECTION'),
4040
'table' => env('DB_QUEUE_TABLE', 'jobs'),
4141
'queue' => env('DB_QUEUE', 'default'),
42-
'retry_after' => env('DB_QUEUE_RETRY_AFTER', 90),
42+
'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
4343
'after_commit' => false,
4444
],
4545

4646
'beanstalkd' => [
4747
'driver' => 'beanstalkd',
4848
'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
4949
'queue' => env('BEANSTALKD_QUEUE', 'default'),
50-
'retry_after' => env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
50+
'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
5151
'block_for' => 0,
5252
'after_commit' => false,
5353
],
@@ -67,7 +67,7 @@
6767
'driver' => 'redis',
6868
'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
6969
'queue' => env('REDIS_QUEUE', 'default'),
70-
'retry_after' => env('REDIS_QUEUE_RETRY_AFTER', 90),
70+
'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
7171
'block_for' => null,
7272
'after_commit' => false,
7373
],

config/services.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
2525
],
2626

27+
'resend' => [
28+
'key' => env('RESEND_KEY'),
29+
],
30+
2731
'slack' => [
2832
'notifications' => [
2933
'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),

config/session.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
| the framework. Typically, you should not need to change this value
126126
| since doing so does not grant a meaningful security improvement.
127127
|
128-
|
129128
*/
130129

131130
'cookie' => env(

phpunit.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<env name="APP_MAINTENANCE_DRIVER" value="file"/>
2323
<env name="BCRYPT_ROUNDS" value="4"/>
2424
<env name="CACHE_STORE" value="array"/>
25-
<env name="DB_DATABASE" value="testing"/>
25+
<!-- <env name="DB_CONNECTION" value="sqlite"/> -->
26+
<!-- <env name="DB_DATABASE" value=":memory:"/> -->
2627
<env name="MAIL_MAILER" value="array"/>
2728
<env name="PULSE_ENABLED" value="false"/>
2829
<env name="QUEUE_CONNECTION" value="sync"/>

0 commit comments

Comments
 (0)