Skip to content

Upgrade to Symfony 6.1 #1339

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 1 commit into from
Jun 21, 2022
Merged

Upgrade to Symfony 6.1 #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.0']
php-version: ['8.1']

steps:
- name: "Checkout code"
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ env:
fail-fast: true
PHPUNIT_FLAGS: "-v"
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
SYMFONY_REQUIRE: ">=4.4"
# 40x: Since symfony/monolog-bridge 5.2:
# Passing an actionLevel (int|string) as constructor's 3rd argument of
# "Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy"
# is deprecated, "Monolog\Handler\FingersCrossed\ActivationStrategyInterface" expected.
SYMFONY_DEPRECATIONS_HELPER: 40
SYMFONY_REQUIRE: ">=6.0"
SYMFONY_DEPRECATIONS_HELPER: 7

jobs:
test:
Expand All @@ -26,12 +22,12 @@ jobs:
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-version: ['8.0', '8.1']
php-version: ['8.1']
include:
- operating-system: 'macos-latest'
php-version: '8.0'
php-version: '8.1'
- operating-system: 'windows-latest'
php-version: '8.0'
php-version: '8.1'

steps:
- name: "Checkout code"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You can also learn about these practices in [the official Symfony Book][5].
Requirements
------------

* PHP 8.0.2 or higher;
* PHP 8.1.0 or higher;
* PDO-SQLite PHP extension enabled;
* and the [usual Symfony application requirements][2].

Expand Down
57 changes: 28 additions & 29 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
"symfony/polyfill-php72": "*",
"symfony/polyfill-php73": "*",
"symfony/polyfill-php74": "*",
"symfony/polyfill-php80": "*"
"symfony/polyfill-php80": "*",
Copy link
Contributor

Choose a reason for hiding this comment

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

both can be removed as now the php version is forced via the require

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure ... all these are in the replace section of composer.json. If I'm right, listing them here means that Composer won't download those packages even if some dependency requires them. So, the idea is that you add new polyfills when you upgrade your minimum required PHP version.

Copy link
Contributor

Choose a reason for hiding this comment

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

ho right! I did not pay attention where the location were at first :s my bad

Copy link
Member

Choose a reason for hiding this comment

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

this is indeed the list of polyfills that are replaced by the project platform requirements. So they should be added, not removed.

"symfony/polyfill-php81": "*"
},
"require": {
"php": ">=8.0.2",
"php": ">=8.1",
Copy link
Contributor

Choose a reason for hiding this comment

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

do not forget the readme file's requirements :)

"ext-pdo_sqlite": "*",
"doctrine/dbal": "^3.1",
"doctrine/doctrine-bundle": "^2.5",
Expand All @@ -21,26 +22,27 @@
"league/commonmark": "^2.1",
"sensio/framework-extra-bundle": "^6.2",
"symfony/apache-pack": "^1.0",
"symfony/asset": "^6.0",
"symfony/console": "^6.0",
"symfony/dotenv": "^6.0",
"symfony/expression-language": "^6.0",
"symfony/asset": "^6.1",
"symfony/console": "^6.1",
"symfony/dotenv": "^6.1",
"symfony/expression-language": "^6.1",
"symfony/flex": "^2.0",
"symfony/form": "^6.0",
"symfony/framework-bundle": "^6.0",
"symfony/intl": "^6.0",
"symfony/mailer": "^6.0",
"symfony/form": "^6.1",
"symfony/framework-bundle": "^6.1",
"symfony/html-sanitizer": "^6.1",
"symfony/http-client": "^6.1",
"symfony/intl": "^6.1",
"symfony/mailer": "^6.1",
"symfony/monolog-bundle": "^3.7",
"symfony/polyfill-intl-messageformatter": "^1.12",
"symfony/runtime": "^6.0",
"symfony/security-bundle": "^6.0",
"symfony/string": "^6.0",
"symfony/translation": "^6.0",
"symfony/twig-bundle": "^6.0",
"symfony/validator": "^6.0",
"symfony/runtime": "^6.1",
"symfony/security-bundle": "^6.1",
"symfony/string": "^6.1",
"symfony/translation": "^6.1",
"symfony/twig-bundle": "^6.1",
"symfony/validator": "^6.1",
"symfony/webpack-encore-bundle": "^1.13",
"symfony/yaml": "^6.0",
"tgalopin/html-sanitizer-bundle": "^1.4",
"symfony/yaml": "^6.1",
"twig/extra-bundle": "^3.3",
"twig/intl-extra": "^3.3",
"twig/markdown-extra": "^3.3"
Expand All @@ -49,17 +51,17 @@
"dama/doctrine-test-bundle": "^7.0",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"phpstan/phpstan": "^1.2",
"symfony/browser-kit": "^6.0",
"symfony/css-selector": "^6.0",
"symfony/debug-bundle": "^6.0",
"symfony/browser-kit": "^6.1",
"symfony/css-selector": "^6.1",
"symfony/debug-bundle": "^6.1",
"symfony/maker-bundle": "^1.36",
"symfony/phpunit-bridge": "^6.0",
"symfony/stopwatch": "^6.0",
"symfony/web-profiler-bundle": "^6.0"
"symfony/phpunit-bridge": "^6.1",
"symfony/stopwatch": "^6.1",
"symfony/web-profiler-bundle": "^6.1"
},
"config": {
"platform": {
"php": "8.0.2"
"php": "8.1.0"
},
"preferred-install": {
"*": "dist"
Expand Down Expand Up @@ -93,13 +95,10 @@
"@auto-scripts"
]
},
"conflict": {
"symfony/symfony": "*"
},
"extra": {
"symfony": {
"allow-contrib": true,
"require": "6.0.*"
"require": "6.1.*"
}
}
}
Loading