Skip to content

Commit dbd579c

Browse files
crynobonecrynobone
authored
[11.x] Supports PHP 8.4 (#53468)
* [11.x] Supports PHP 8.4 Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update tests.yml * Update tests.yml * Update tests.yml * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update tests.yml * Update tests.yml * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update tests.yml * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update tests.yml * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update composer.json * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
1 parent d8438ec commit dbd579c

File tree

16 files changed

+93
-92
lines changed

16 files changed

+93
-92
lines changed

‎.github/workflows/databases-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2
3232
with:
33-
php-version: 8.2
33+
php-version: 8.3
3434
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
3535
tools: composer:v2
3636
coverage: none
@@ -76,7 +76,7 @@ jobs:
7676
- name: Setup PHP
7777
uses: shivammathur/setup-php@v2
7878
with:
79-
php-version: 8.2
79+
php-version: 8.3
8080
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
8181
tools: composer:v2
8282
coverage: none

‎.github/workflows/databases.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup PHP
3535
uses: shivammathur/setup-php@v2
3636
with:
37-
php-version: 8.2
37+
php-version: 8.3
3838
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
3939
tools: composer:v2
4040
coverage: none
@@ -81,7 +81,7 @@ jobs:
8181
- name: Setup PHP
8282
uses: shivammathur/setup-php@v2
8383
with:
84-
php-version: 8.2
84+
php-version: 8.3
8585
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
8686
tools: composer:v2
8787
coverage: none
@@ -127,7 +127,7 @@ jobs:
127127
- name: Setup PHP
128128
uses: shivammathur/setup-php@v2
129129
with:
130-
php-version: 8.2
130+
php-version: 8.3
131131
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
132132
tools: composer:v2
133133
coverage: none
@@ -174,7 +174,7 @@ jobs:
174174
- name: Setup PHP
175175
uses: shivammathur/setup-php@v2
176176
with:
177-
php-version: 8.2
177+
php-version: 8.3
178178
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr
179179
tools: composer:v2
180180
coverage: none
@@ -223,7 +223,7 @@ jobs:
223223
- name: Setup PHP
224224
uses: shivammathur/setup-php@v2
225225
with:
226-
php-version: 8.2
226+
php-version: 8.3
227227
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr
228228
tools: composer:v2
229229
coverage: none
@@ -270,7 +270,7 @@ jobs:
270270
- name: Setup PHP
271271
uses: shivammathur/setup-php@v2
272272
with:
273-
php-version: 8.2
273+
php-version: 8.3
274274
extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr
275275
tools: composer:v2
276276
coverage: none
@@ -318,7 +318,7 @@ jobs:
318318
- name: Setup PHP
319319
uses: shivammathur/setup-php@v2
320320
with:
321-
php-version: 8.2
321+
php-version: 8.3
322322
extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr
323323
tools: composer:v2
324324
coverage: none
@@ -357,7 +357,7 @@ jobs:
357357
- name: Setup PHP
358358
uses: shivammathur/setup-php@v2
359359
with:
360-
php-version: 8.2
360+
php-version: 8.3
361361
extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr
362362
tools: composer:v2
363363
coverage: none

‎.github/workflows/tests.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
strategy:
4040
fail-fast: true
4141
matrix:
42-
php: [8.2, 8.3]
43-
phpunit: ['10.5', '11.0.1']
42+
php: [8.2, 8.3, 8.4]
43+
phpunit: ['10.5.12', '11.3.2']
4444
stability: [prefer-lowest, prefer-stable]
4545

4646
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
@@ -53,7 +53,7 @@ jobs:
5353
uses: shivammathur/setup-php@v2
5454
with:
5555
php-version: ${{ matrix.php }}
56-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr
56+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis, igbinary, msgpack, memcached, gmp, :php-psr
5757
ini-values: error_reporting=E_ALL
5858
tools: composer:v2
5959
coverage: none
@@ -64,12 +64,14 @@ jobs:
6464
- name: Set Framework version
6565
run: composer config version "11.x-dev"
6666

67-
- name: Set minimum PHP 8.2 versions
67+
- name: Set Minimum PHP 8.4 Versions
6868
uses: nick-fields/retry@v3
6969
with:
7070
timeout_minutes: 5
7171
max_attempts: 5
72-
command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update
72+
command: composer require nesbot/carbon:^3.4 --no-interaction --no-update
73+
shell: bash
74+
if: matrix.php >= 8.4
7375

7476
- name: Set PHPUnit
7577
uses: nick-fields/retry@v3
@@ -109,9 +111,12 @@ jobs:
109111
strategy:
110112
fail-fast: true
111113
matrix:
112-
php: [8.2, 8.3]
114+
php: [8.2, 8.3, 8.4]
113115
phpunit: ['10.5', '11.0.1']
114116
stability: [prefer-lowest, prefer-stable]
117+
exclude:
118+
- php: 8.4
119+
stability: prefer-lowest
115120

116121
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
117122

@@ -135,14 +140,6 @@ jobs:
135140
- name: Set Framework version
136141
run: composer config version "11.x-dev"
137142

138-
- name: Set Minimum PHP 8.2 Versions
139-
uses: nick-fields/retry@v3
140-
with:
141-
timeout_minutes: 5
142-
max_attempts: 5
143-
command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update
144-
shell: bash
145-
146143
- name: Set PHPUnit
147144
uses: nick-fields/retry@v3
148145
with:

‎composer.json

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,38 @@
2626
"composer-runtime-api": "^2.2",
2727
"brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
2828
"doctrine/inflector": "^2.0.5",
29-
"dragonmantank/cron-expression": "^3.3.2",
29+
"dragonmantank/cron-expression": "^3.4",
3030
"egulias/email-validator": "^3.2.1|^4.0",
3131
"fruitcake/php-cors": "^1.3",
32-
"guzzlehttp/guzzle": "^7.8",
32+
"guzzlehttp/guzzle": "^7.8.2",
3333
"guzzlehttp/uri-template": "^1.0",
3434
"laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
3535
"laravel/serializable-closure": "^1.3|^2.0",
3636
"league/commonmark": "^2.2.1",
37-
"league/flysystem": "^3.8.0",
37+
"league/flysystem": "^3.25.1",
38+
"league/flysystem-local": "^3.25.1",
3839
"monolog/monolog": "^3.0",
39-
"nesbot/carbon": "^2.72.2|^3.0",
40+
"nesbot/carbon": "^2.72.2|^3.4",
4041
"nunomaduro/termwind": "^2.0",
4142
"psr/container": "^1.1.1|^2.0.1",
4243
"psr/log": "^1.0|^2.0|^3.0",
4344
"psr/simple-cache": "^1.0|^2.0|^3.0",
4445
"ramsey/uuid": "^4.7",
45-
"symfony/console": "^7.0",
46-
"symfony/error-handler": "^7.0",
47-
"symfony/finder": "^7.0",
48-
"symfony/http-foundation": "^7.0",
49-
"symfony/http-kernel": "^7.0",
50-
"symfony/mailer": "^7.0",
51-
"symfony/mime": "^7.0",
52-
"symfony/polyfill-php83": "^1.28",
53-
"symfony/process": "^7.0",
54-
"symfony/routing": "^7.0",
55-
"symfony/uid": "^7.0",
56-
"symfony/var-dumper": "^7.0",
46+
"symfony/console": "^7.0.3",
47+
"symfony/error-handler": "^7.0.3",
48+
"symfony/finder": "^7.0.3",
49+
"symfony/http-foundation": "^7.0.3",
50+
"symfony/http-kernel": "^7.0.3",
51+
"symfony/mailer": "^7.0.3",
52+
"symfony/mime": "^7.0.3",
53+
"symfony/polyfill-php83": "^1.31",
54+
"symfony/process": "^7.0.3",
55+
"symfony/routing": "^7.0.3",
56+
"symfony/uid": "^7.0.3",
57+
"symfony/var-dumper": "^7.0.3",
5758
"tijsverkoyen/css-to-inline-styles": "^2.2.5",
58-
"vlucas/phpdotenv": "^5.4.1",
59-
"voku/portable-ascii": "^2.0"
59+
"vlucas/phpdotenv": "^5.6.1",
60+
"voku/portable-ascii": "^2.0.2"
6061
},
6162
"replace": {
6263
"illuminate/auth": "self.version",
@@ -98,24 +99,27 @@
9899
"require-dev": {
99100
"ext-gmp": "*",
100101
"ably/ably-php": "^1.0",
101-
"aws/aws-sdk-php": "^3.235.5",
102-
"fakerphp/faker": "^1.23",
103-
"league/flysystem-aws-s3-v3": "^3.0",
104-
"league/flysystem-ftp": "^3.0",
105-
"league/flysystem-path-prefixing": "^3.3",
106-
"league/flysystem-read-only": "^3.3",
107-
"league/flysystem-sftp-v3": "^3.0",
102+
"aws/aws-sdk-php": "^3.322.9",
103+
"fakerphp/faker": "^1.24",
104+
"guzzlehttp/promises": "^2.0.3",
105+
"guzzlehttp/psr7": "^2.4",
106+
"league/flysystem-aws-s3-v3": "^3.25.1",
107+
"league/flysystem-ftp": "^3.25.1",
108+
"league/flysystem-path-prefixing": "^3.25.1",
109+
"league/flysystem-read-only": "^3.25.1",
110+
"league/flysystem-sftp-v3": "^3.25.1",
108111
"mockery/mockery": "^1.6.10",
109112
"nyholm/psr7": "^1.2",
110113
"orchestra/testbench-core": "^9.6",
111-
"pda/pheanstalk": "^5.0",
114+
"pda/pheanstalk": "^5.0.6",
112115
"phpstan/phpstan": "^1.11.5",
113-
"phpunit/phpunit": "^10.5|^11.0",
114-
"predis/predis": "^2.0.2",
116+
"phpunit/phpunit": "^10.5.35|^11.3.6",
117+
"predis/predis": "^2.3",
115118
"resend/resend-php": "^0.10.0",
116-
"symfony/cache": "^7.0",
117-
"symfony/http-client": "^7.0",
118-
"symfony/psr-http-message-bridge": "^7.0"
119+
"symfony/cache": "^7.0.3",
120+
"symfony/http-client": "^7.0.3",
121+
"symfony/translation": "^7.0.3",
122+
"symfony/psr-http-message-bridge": "^7.0.3"
119123
},
120124
"conflict": {
121125
"mockery/mockery": "1.6.8",
@@ -169,21 +173,21 @@
169173
"ext-posix": "Required to use all features of the queue worker.",
170174
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
171175
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
172-
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
176+
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
173177
"brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
174178
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
175179
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
176180
"laravel/tinker": "Required to use the tinker console command (^2.0).",
177-
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
178-
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
179-
"league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
180-
"league/flysystem-read-only": "Required to use read-only disks (^3.3)",
181-
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
181+
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
182+
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
183+
"league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).",
184+
"league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
185+
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
182186
"mockery/mockery": "Required to use mocking (^1.6).",
183187
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
184188
"pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
185189
"phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
186-
"predis/predis": "Required to use the predis connector (^2.0.2).",
190+
"predis/predis": "Required to use the predis connector (^2.3).",
187191
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
188192
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
189193
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",

‎src/Illuminate/Console/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"illuminate/view": "^11.0",
2424
"laravel/prompts": "^0.1.20|^0.2|^0.3",
2525
"nunomaduro/termwind": "^2.0",
26-
"symfony/console": "^7.0",
27-
"symfony/polyfill-php83": "^1.28",
28-
"symfony/process": "^7.0"
26+
"symfony/console": "^7.0.3",
27+
"symfony/polyfill-php83": "^1.31",
28+
"symfony/process": "^7.0.3"
2929
},
3030
"autoload": {
3131
"psr-4": {

‎src/Illuminate/Cookie/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"illuminate/contracts": "^11.0",
2121
"illuminate/macroable": "^11.0",
2222
"illuminate/support": "^11.0",
23-
"symfony/http-foundation": "^7.0",
24-
"symfony/http-kernel": "^7.0"
23+
"symfony/http-foundation": "^7.0.3",
24+
"symfony/http-kernel": "^7.0.3"
2525
},
2626
"autoload": {
2727
"psr-4": {

‎src/Illuminate/Database/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"suggest": {
3838
"ext-filter": "Required to use the Postgres database driver.",
39-
"fakerphp/faker": "Required to use the eloquent factory builder (^1.21).",
39+
"fakerphp/faker": "Required to use the eloquent factory builder (^1.24).",
4040
"illuminate/console": "Required to use the database commands (^11.0).",
4141
"illuminate/events": "Required to use the observers with Eloquent (^11.0).",
4242
"illuminate/filesystem": "Required to use the migrations (^11.0).",

‎src/Illuminate/Filesystem/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"illuminate/contracts": "^11.0",
2020
"illuminate/macroable": "^11.0",
2121
"illuminate/support": "^11.0",
22-
"symfony/finder": "^7.0"
22+
"symfony/finder": "^7.0.3"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -39,10 +39,10 @@
3939
"ext-ftp": "Required to use the Flysystem FTP driver.",
4040
"ext-hash": "Required to use the Filesystem class.",
4141
"illuminate/http": "Required for handling uploaded files (^7.0).",
42-
"league/flysystem": "Required to use the Flysystem local driver (^3.0.16).",
43-
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
44-
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
45-
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
42+
"league/flysystem": "Required to use the Flysystem local driver (^3.25.1).",
43+
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
44+
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
45+
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
4646
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
4747
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
4848
"symfony/mime": "Required to enable support for guessing extensions (^7.0)."

‎src/Illuminate/Http/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
"php": "^8.2",
1818
"ext-filter": "*",
1919
"fruitcake/php-cors": "^1.3",
20-
"guzzlehttp/guzzle": "^7.8",
20+
"guzzlehttp/guzzle": "^7.8.2",
2121
"guzzlehttp/uri-template": "^1.0",
2222
"illuminate/collections": "^11.0",
2323
"illuminate/macroable": "^11.0",
2424
"illuminate/session": "^11.0",
2525
"illuminate/support": "^11.0",
26-
"symfony/http-foundation": "^7.0",
27-
"symfony/http-kernel": "^7.0",
28-
"symfony/polyfill-php83": "^1.28",
29-
"symfony/mime": "^7.0"
26+
"symfony/http-foundation": "^7.0.3",
27+
"symfony/http-kernel": "^7.0.3",
28+
"symfony/polyfill-php83": "^1.31",
29+
"symfony/mime": "^7.0.3"
3030
},
3131
"autoload": {
3232
"psr-4": {

‎src/Illuminate/Mail/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"illuminate/support": "^11.0",
2323
"league/commonmark": "^2.2",
2424
"psr/log": "^1.0|^2.0|^3.0",
25-
"symfony/mailer": "^7.0",
25+
"symfony/mailer": "^7.0.3",
2626
"tijsverkoyen/css-to-inline-styles": "^2.2.5"
2727
},
2828
"autoload": {
@@ -36,7 +36,7 @@
3636
}
3737
},
3838
"suggest": {
39-
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.235.5).",
39+
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).",
4040
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
4141
"symfony/http-client": "Required to use the Symfony API mail transports (^7.0).",
4242
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",

0 commit comments

Comments
 (0)