Skip to content

Commit e6f13f6

Browse files
authored
Merge branch 'laravel:12.x' into 12.x
2 parents df875e4 + e5e00b6 commit e6f13f6

File tree

697 files changed

+20357
-4937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

697 files changed

+20357
-4937
lines changed

.github/workflows/tests.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ports:
2020
- 11211:11211
2121
mysql:
22-
image: mysql:5.7
22+
image: mysql:8
2323
env:
2424
MYSQL_ALLOW_EMPTY_PASSWORD: yes
2525
MYSQL_DATABASE: forge
@@ -40,13 +40,20 @@ jobs:
4040
fail-fast: true
4141
matrix:
4242
php: [8.2, 8.3, 8.4]
43-
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.0']
43+
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
4444
stability: [prefer-lowest, prefer-stable]
4545
exclude:
4646
- php: 8.2
4747
phpunit: '12.0.0'
4848
- php: 8.2
49+
phpunit: '12.3.0'
50+
include:
51+
- php: 8.3
4952
phpunit: '12.1.0'
53+
stability: prefer-stable
54+
- php: 8.3
55+
phpunit: '12.2.0'
56+
stability: prefer-stable
5057

5158
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
5259

@@ -69,6 +76,15 @@ jobs:
6976
- name: Set Framework version
7077
run: composer config version "12.x-dev"
7178

79+
- name: Set Minimum dependencies for `prefer-lowest`
80+
uses: nick-fields/retry@v3
81+
with:
82+
timeout_minutes: 5
83+
max_attempts: 5
84+
command: composer require opis/string:2.0.1 --no-interaction --no-update
85+
shell: bash
86+
if: matrix.stability == 'prefer-lowest'
87+
7288
- name: Install dependencies
7389
uses: nick-fields/retry@v3
7490
with:
@@ -101,13 +117,20 @@ jobs:
101117
fail-fast: true
102118
matrix:
103119
php: [8.2, 8.3, 8.4]
104-
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.0']
120+
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
105121
stability: [prefer-lowest, prefer-stable]
106122
exclude:
107123
- php: 8.2
108124
phpunit: '12.0.0'
109125
- php: 8.2
126+
phpunit: '12.3.0'
127+
include:
128+
- php: 8.3
110129
phpunit: '12.1.0'
130+
stability: prefer-stable
131+
- php: 8.3
132+
phpunit: '12.2.0'
133+
stability: prefer-stable
111134

112135
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
113136

@@ -131,6 +154,15 @@ jobs:
131154
- name: Set Framework version
132155
run: composer config version "12.x-dev"
133156

157+
- name: Set Minimum dependencies for `prefer-lowest`
158+
uses: nick-fields/retry@v3
159+
with:
160+
timeout_minutes: 5
161+
max_attempts: 5
162+
command: composer require opis/string:2.0.1 --no-interaction --no-update
163+
shell: bash
164+
if: matrix.stability == 'prefer-lowest'
165+
134166
- name: Install dependencies
135167
uses: nick-fields/retry@v3
136168
with:

.github/workflows/update-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 18
24+
node-version: 22
2525

2626
- name: Update Exception Renderer Assets
2727
run: |

.gitignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
.DS_Store
2+
.phpunit.result.cache
3+
/.fleet
4+
/.idea
15
/.phpunit.cache
6+
/phpunit.xml
7+
/.vscode
28
/vendor
39
composer.phar
410
composer.lock
5-
.DS_Store
611
Thumbs.db
7-
/phpunit.xml
8-
/.idea
9-
/.fleet
10-
/.vscode
11-
.phpunit.result.cache

CHANGELOG.md

Lines changed: 481 additions & 1 deletion
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
66
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
77
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
8+
<a href="https://insights.linuxfoundation.org/project/laravel-framework"><img src="https://insights.linuxfoundation.org/api/badge/health-score?project=laravel-framework" alt="Health score"></a>
89
</p>
910

1011
## About Laravel

bin/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ git tag $VERSION
5252
git push origin --tags
5353

5454
# Tag Components
55-
for REMOTE in auth broadcasting bus cache collections conditionable config console container contracts cookie database encryption events filesystem hashing http log macroable mail notifications pagination pipeline process queue redis routing session support testing translation validation view
55+
for REMOTE in auth broadcasting bus cache collections conditionable config console container contracts cookie database encryption events filesystem hashing http json-schema log macroable mail notifications pagination pipeline process queue redis routing session support testing translation validation view
5656
do
5757
echo ""
5858
echo ""

bin/split.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ remote events [email protected]:illuminate/events.git
3535
remote filesystem [email protected]:illuminate/filesystem.git
3636
remote hashing [email protected]:illuminate/hashing.git
3737
remote http [email protected]:illuminate/http.git
38+
remote json-schema [email protected]:illuminate/json-schema.git
3839
remote log [email protected]:illuminate/log.git
3940
remote macroable [email protected]:illuminate/macroable.git
4041
remote mail [email protected]:illuminate/mail.git
@@ -69,6 +70,7 @@ split 'src/Illuminate/Events' events
6970
split 'src/Illuminate/Filesystem' filesystem
7071
split 'src/Illuminate/Hashing' hashing
7172
split 'src/Illuminate/Http' http
73+
split 'src/Illuminate/JsonSchema' json-schema
7274
split 'src/Illuminate/Log' log
7375
split 'src/Illuminate/Macroable' macroable
7476
split 'src/Illuminate/Mail' mail

composer.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"ext-session": "*",
2525
"ext-tokenizer": "*",
2626
"composer-runtime-api": "^2.2",
27-
"brick/math": "^0.11|^0.12|^0.13",
27+
"brick/math": "^0.11|^0.12|^0.13|^0.14",
2828
"doctrine/inflector": "^2.0.5",
2929
"dragonmantank/cron-expression": "^3.4",
3030
"egulias/email-validator": "^3.2.1|^4.0",
@@ -51,7 +51,9 @@
5151
"symfony/http-kernel": "^7.2.0",
5252
"symfony/mailer": "^7.2.0",
5353
"symfony/mime": "^7.2.0",
54-
"symfony/polyfill-php83": "^1.31",
54+
"symfony/polyfill-php83": "^1.33",
55+
"symfony/polyfill-php84": "^1.33",
56+
"symfony/polyfill-php85": "^1.33",
5557
"symfony/process": "^7.2.0",
5658
"symfony/routing": "^7.2.0",
5759
"symfony/uid": "^7.2.0",
@@ -79,6 +81,7 @@
7981
"illuminate/filesystem": "self.version",
8082
"illuminate/hashing": "self.version",
8183
"illuminate/http": "self.version",
84+
"illuminate/json-schema": "self.version",
8285
"illuminate/log": "self.version",
8386
"illuminate/macroable": "self.version",
8487
"illuminate/mail": "self.version",
@@ -111,7 +114,8 @@
111114
"league/flysystem-read-only": "^3.25.1",
112115
"league/flysystem-sftp-v3": "^3.25.1",
113116
"mockery/mockery": "^1.6.10",
114-
"orchestra/testbench-core": "^10.0.0",
117+
"opis/json-schema": "^2.4.1",
118+
"orchestra/testbench-core": "^10.6.5",
115119
"pda/pheanstalk": "^5.0.6|^7.0.0",
116120
"php-http/discovery": "^1.15",
117121
"phpstan/phpstan": "^2.0",
@@ -177,7 +181,7 @@
177181
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
178182
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
179183
"brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
180-
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
184+
"fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
181185
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
182186
"laravel/tinker": "Required to use the tinker console command (^2.0).",
183187
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",

config/cache.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
'serialize' => false,
3939
],
4040

41+
'session' => [
42+
'driver' => 'session',
43+
'key' => env('SESSION_CACHE_KEY', '_cache'),
44+
],
45+
4146
'database' => [
4247
'driver' => 'database',
4348
'connection' => env('DB_CACHE_CONNECTION'),

config/database.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
'busy_timeout' => null,
4242
'journal_mode' => null,
4343
'synchronous' => null,
44+
'transaction_mode' => 'DEFERRED',
45+
'pragmas' => [],
4446
],
4547

4648
'mysql' => [
@@ -159,6 +161,10 @@
159161
'password' => env('REDIS_PASSWORD'),
160162
'port' => env('REDIS_PORT', '6379'),
161163
'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),
162168
],
163169

164170
'cache' => [
@@ -168,6 +174,10 @@
168174
'password' => env('REDIS_PASSWORD'),
169175
'port' => env('REDIS_PORT', '6379'),
170176
'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),
171181
],
172182

173183
],

0 commit comments

Comments
 (0)