Skip to content

Commit 03fa6a2

Browse files
authored
[9.x] Update to Symfony v6 and drop PHP 7.4 support (#37941)
* revert * revert * PHP 8 only * Update setHidden * Disable windows tests for now * Replace removed constant * re-enable windows tests * Bump minimum Mockery
1 parent 08728a3 commit 03fa6a2

File tree

4 files changed

+14
-24
lines changed

4 files changed

+14
-24
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: true
3838
matrix:
39-
php: ['7.4', '8.0']
39+
php: ['8.0']
4040
stability: [prefer-lowest, prefer-stable]
4141
include:
4242
- php: '8.1'
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
fail-fast: true
9191
matrix:
92-
php: ['7.4', '8.0']
92+
php: ['8.0']
9393
stability: [prefer-lowest, prefer-stable]
9494
include:
9595
- php: '8.1'

composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.4|^8.0",
18+
"php": "^8.0",
1919
"ext-json": "*",
2020
"ext-mbstring": "*",
2121
"ext-openssl": "*",
@@ -31,15 +31,15 @@
3131
"psr/simple-cache": "^1.0",
3232
"ramsey/uuid": "^4.0",
3333
"swiftmailer/swiftmailer": "^6.2.7",
34-
"symfony/console": "^5.3",
35-
"symfony/error-handler": "^5.3",
36-
"symfony/finder": "^5.3",
37-
"symfony/http-foundation": "^5.3",
38-
"symfony/http-kernel": "^5.3",
39-
"symfony/mime": "^5.3",
40-
"symfony/process": "^5.3",
41-
"symfony/routing": "^5.3",
42-
"symfony/var-dumper": "^5.3",
34+
"symfony/console": "^6.0",
35+
"symfony/error-handler": "^6.0",
36+
"symfony/finder": "^6.0",
37+
"symfony/http-foundation": "^6.0",
38+
"symfony/http-kernel": "^6.0",
39+
"symfony/mime": "^6.0",
40+
"symfony/process": "^6.0",
41+
"symfony/routing": "^6.0",
42+
"symfony/var-dumper": "^6.0",
4343
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
4444
"vlucas/phpdotenv": "^5.3",
4545
"voku/portable-ascii": "^1.4.8"
@@ -85,7 +85,7 @@
8585
"league/flysystem-aws-s3-v3": "^2.0",
8686
"league/flysystem-ftp": "^2.0",
8787
"league/flysystem-sftp": "^2.0",
88-
"mockery/mockery": "^1.4.2",
88+
"mockery/mockery": "^1.4.3",
8989
"orchestra/testbench-core": "^7.0",
9090
"pda/pheanstalk": "^4.0",
9191
"phpunit/phpunit": "^9.4",

src/Illuminate/Console/Command.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,6 @@ public function isHidden()
169169
return $this->hidden;
170170
}
171171

172-
/**
173-
* {@inheritdoc}
174-
*/
175-
public function setHidden(bool $hidden)
176-
{
177-
parent::setHidden($this->hidden = $hidden);
178-
179-
return $this;
180-
}
181-
182172
/**
183173
* Get the Laravel application instance.
184174
*

tests/Routing/RoutingUrlGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public function testHttpsRoutesWithDomains()
508508

509509
public function testRoutesWithDomainsThroughProxy()
510510
{
511-
Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_ALL);
511+
Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_FOR | SymfonyRequest::HEADER_X_FORWARDED_HOST | SymfonyRequest::HEADER_X_FORWARDED_PORT | SymfonyRequest::HEADER_X_FORWARDED_PROTO);
512512

513513
$url = new UrlGenerator(
514514
$routes = new RouteCollection,

0 commit comments

Comments
 (0)