Skip to content

Commit 6553c55

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # tests/Routing/AttributeRoutingTest.php
2 parents 702a31d + 1faa32a commit 6553c55

File tree

466 files changed

+11549
-3661
lines changed

Some content is hidden

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

466 files changed

+11549
-3661
lines changed

.github/workflows/tests.yml

Lines changed: 32 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,12 +40,16 @@ jobs:
4040
fail-fast: true
4141
matrix:
4242
php: [8.3, 8.4]
43-
phpunit: ['11.5.3', '12.0.0', '12.2.0']
43+
phpunit: ['11.5.3', '12.0.0', '12.3.0']
4444
stability: [prefer-lowest, prefer-stable]
4545
include:
4646
- php: 8.3
4747
phpunit: '12.1.0'
4848
stability: prefer-stable
49+
- php: 8.3
50+
phpunit: '12.2.0'
51+
stability: prefer-stable
52+
4953

5054
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
5155

@@ -68,6 +72,15 @@ jobs:
6872
- name: Set Framework version
6973
run: composer config version "13.x-dev"
7074

75+
- name: Set Minimum dependencies for `prefer-lowest`
76+
uses: nick-fields/retry@v3
77+
with:
78+
timeout_minutes: 5
79+
max_attempts: 5
80+
command: composer require opis/string:2.0.1 --no-interaction --no-update
81+
shell: bash
82+
if: matrix.stability == 'prefer-lowest'
83+
7184
- name: Install dependencies
7285
uses: nick-fields/retry@v3
7386
with:
@@ -100,8 +113,15 @@ jobs:
100113
fail-fast: true
101114
matrix:
102115
php: [8.3, 8.4]
103-
phpunit: ['11.5.3', '12.0.0', '12.1.0']
116+
phpunit: ['11.5.3', '12.0.0', '12.3.0']
104117
stability: [prefer-lowest, prefer-stable]
118+
include:
119+
- php: 8.3
120+
phpunit: '12.1.0'
121+
stability: prefer-stable
122+
- php: 8.3
123+
phpunit: '12.2.0'
124+
stability: prefer-stable
105125

106126
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
107127

@@ -125,6 +145,15 @@ jobs:
125145
- name: Set Framework version
126146
run: composer config version "13.x-dev"
127147

148+
- name: Set Minimum dependencies for `prefer-lowest`
149+
uses: nick-fields/retry@v3
150+
with:
151+
timeout_minutes: 5
152+
max_attempts: 5
153+
command: composer require opis/string:2.0.1 --no-interaction --no-update
154+
shell: bash
155+
if: matrix.stability == 'prefer-lowest'
156+
128157
- name: Install dependencies
129158
uses: nick-fields/retry@v3
130159
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: 281 additions & 1 deletion
Large diffs are not rendered by default.

README.md

Lines changed: 3 additions & 2 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
@@ -26,10 +27,10 @@ Laravel is accessible, yet powerful, providing tools needed for large, robust ap
2627

2728
Laravel has the most extensive and thorough documentation and video tutorial library of any modern web application framework. The [Laravel documentation](https://laravel.com/docs) is in-depth and complete, making it a breeze to get started learning the framework.
2829

29-
You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
30-
3130
If you're not in the mood to read, [Laracasts](https://laracasts.com) contains thousands of video tutorials covering a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
3231

32+
You can also watch bite-sized lessons with real-world projects on [Laravel Learn](https://laravel.com/learn), where you will be guided through building a Laravel application from scratch while learning PHP fundamentals.
33+
3334
## Contributing
3435

3536
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).

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: 6 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,9 +51,9 @@
5151
"symfony/http-kernel": "^7.4.0|^8.0.0",
5252
"symfony/mailer": "^7.4.0|^8.0.0",
5353
"symfony/mime": "^7.4.0|^8.0.0",
54+
"symfony/polyfill-php84": "^1.33",
55+
"symfony/polyfill-php85": "^1.33",
5456
"symfony/process": "^7.4.0|^8.0.0",
55-
"symfony/polyfill-php84": "^1.31",
56-
"symfony/polyfill-php85": "^1.31",
5757
"symfony/routing": "^7.4.0|^8.0.0",
5858
"symfony/uid": "^7.4.0|^8.0.0",
5959
"symfony/var-dumper": "^7.4.0|^8.0.0",
@@ -80,6 +80,7 @@
8080
"illuminate/filesystem": "self.version",
8181
"illuminate/hashing": "self.version",
8282
"illuminate/http": "self.version",
83+
"illuminate/json-schema": "self.version",
8384
"illuminate/log": "self.version",
8485
"illuminate/macroable": "self.version",
8586
"illuminate/mail": "self.version",
@@ -112,6 +113,7 @@
112113
"league/flysystem-read-only": "^3.25.1",
113114
"league/flysystem-sftp-v3": "^3.25.1",
114115
"mockery/mockery": "^1.6.10",
116+
"opis/json-schema": "^2.4.1",
115117
"orchestra/testbench-core": "^11.0.0",
116118
"pda/pheanstalk": "^5.0.6|^7.0.0",
117119
"php-http/discovery": "^1.15",
@@ -178,7 +180,7 @@
178180
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
179181
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
180182
"brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
181-
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
183+
"fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
182184
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
183185
"laravel/tinker": "Required to use the tinker console command (^2.0).",
184186
"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)