Skip to content

[9.x] Update to Symfony v6 and drop PHP 7.4 support #37941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 7, 2021
Merged

[9.x] Update to Symfony v6 and drop PHP 7.4 support #37941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54c2a44
revert
driesvints Jun 7, 2021
3728d14
revert
driesvints Jun 7, 2021
c32f838
PHP 8 only
driesvints Jun 7, 2021
1962bbf
Update setHidden
driesvints Jun 7, 2021
057b8b0
Disable windows tests for now
driesvints Jun 7, 2021
9251797
Replace removed constant
driesvints Jun 7, 2021
8069672
re-enable windows tests
driesvints Jun 7, 2021
65d1807
Bump minimum Mockery
driesvints Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: ['7.4', '8.0']
php: ['8.0']
stability: [prefer-lowest, prefer-stable]
include:
- php: '8.1'
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: ['7.4', '8.0']
php: ['8.0']
stability: [prefer-lowest, prefer-stable]
include:
- php: '8.1'
Expand Down
22 changes: 11 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^7.4|^8.0",
"php": "^8.0",
Copy link
Contributor

@X-Coder264 X-Coder264 Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@driesvints Shouldn't this change be made in all Illuminate components composer.json too?

Copy link
Member Author

@driesvints driesvints Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep seems I forgot to do that. Can you send in a PR? Otherwise I'll try to do that later this week.

Copy link
Contributor

@X-Coder264 X-Coder264 Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I'll send one later today.

"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
Expand All @@ -31,15 +31,15 @@
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^4.0",
"swiftmailer/swiftmailer": "^6.2.7",
"symfony/console": "^5.3",
"symfony/error-handler": "^5.3",
"symfony/finder": "^5.3",
"symfony/http-foundation": "^5.3",
"symfony/http-kernel": "^5.3",
"symfony/mime": "^5.3",
"symfony/process": "^5.3",
"symfony/routing": "^5.3",
"symfony/var-dumper": "^5.3",
"symfony/console": "^6.0",
"symfony/error-handler": "^6.0",
"symfony/finder": "^6.0",
"symfony/http-foundation": "^6.0",
"symfony/http-kernel": "^6.0",
"symfony/mime": "^6.0",
"symfony/process": "^6.0",
"symfony/routing": "^6.0",
"symfony/var-dumper": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
"vlucas/phpdotenv": "^5.3",
"voku/portable-ascii": "^1.4.8"
Expand Down Expand Up @@ -85,7 +85,7 @@
"league/flysystem-aws-s3-v3": "^2.0",
"league/flysystem-ftp": "^2.0",
"league/flysystem-sftp": "^2.0",
"mockery/mockery": "^1.4.2",
"mockery/mockery": "^1.4.3",
"orchestra/testbench-core": "^7.0",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^9.4",
Expand Down
10 changes: 0 additions & 10 deletions src/Illuminate/Console/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,6 @@ public function isHidden()
return $this->hidden;
}

/**
* {@inheritdoc}
*/
public function setHidden(bool $hidden)
{
parent::setHidden($this->hidden = $hidden);

return $this;
}

/**
* Get the Laravel application instance.
*
Expand Down
2 changes: 1 addition & 1 deletion tests/Routing/RoutingUrlGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ public function testHttpsRoutesWithDomains()

public function testRoutesWithDomainsThroughProxy()
{
Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_ALL);
Copy link
Collaborator

@GrahamCampbell GrahamCampbell Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change we could make already on 8.x?

Copy link
Member Author

@driesvints driesvints Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure

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);

$url = new UrlGenerator(
$routes = new RouteCollection,
Expand Down