Skip to content

Commit 096896f

Browse files
committed
feature #1339 Upgrade to Symfony 6.1 (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Upgrade to Symfony 6.1 Don't mind much about the `sanitize_html` Twig filter. I added it quickly to make the application work. We're discussing about how adding again this Twig filter in the Symfony HtmlSanitizer component. ----- These are the remaining deprecations: ``` Remaining indirect deprecation notices (6) 1x: The "DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver" class implements "Doctrine\DBAL\VersionAwarePlatformDriver" that is deprecated All drivers will have to be aware of the server version in the next major release. 1x in PHPUnitExtension::executeBeforeFirstTest from DAMA\DoctrineTestBundle\PHPUnit 1x: The "Symfony\Bridge\Doctrine\Logger\DbalLogger" class implements "Doctrine\DBAL\Logging\SQLLogger" that is deprecated Use {`@see` \Doctrine\DBAL\Logging\Middleware} or implement {`@see` \Doctrine\DBAL\Driver\Middleware} instead. 1x in AddUserCommandTest::testCreateUserNonInteractive from App\Tests\Command 1x: Method "ArrayAccess::offsetExists()" might add "bool" as a native return type declaration in the future. Do the same in implementation "Dflydev\DotAccessData\Data" now to avoid errors or add an explicit `@return` annotation to suppress this message. 1x in BlogControllerTest::testAdminShowPost from App\Tests\Controller\Admin 1x: Method "ArrayAccess::offsetGet()" might add "mixed" as a native return type declaration in the future. Do the same in implementation "Dflydev\DotAccessData\Data" now to avoid errors or add an explicit `@return` annotation to suppress this message. 1x in BlogControllerTest::testAdminShowPost from App\Tests\Controller\Admin 1x: Method "ArrayAccess::offsetSet()" might add "void" as a native return type declaration in the future. Do the same in implementation "Dflydev\DotAccessData\Data" now to avoid errors or add an explicit `@return` annotation to suppress this message. 1x in BlogControllerTest::testAdminShowPost from App\Tests\Controller\Admin 1x: Method "ArrayAccess::offsetUnset()" might add "void" as a native return type declaration in the future. Do the same in implementation "Dflydev\DotAccessData\Data" now to avoid errors or add an explicit `@return` annotation to suppress this message. 1x in BlogControllerTest::testAdminShowPost from App\Tests\Controller\Admin ``` `@dmaicher` do you know how can we remove the deprecation notice about DoctrineTestBundle? Thanks! `@derrabus` do you know how can we fix the deprecation about `Symfony\Bridge\Doctrine\Logger\DbalLogger`? Thanks! Commits ------- e79b100 Upgrade to Symfony 6.1
2 parents c307b2a + e79b100 commit 096896f

28 files changed

+1197
-1002
lines changed

.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
30-
php-version: ['8.0']
30+
php-version: ['8.1']
3131

3232
steps:
3333
- name: "Checkout code"

.github/workflows/tests.yaml

+5-9
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ env:
1010
fail-fast: true
1111
PHPUNIT_FLAGS: "-v"
1212
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
13-
SYMFONY_REQUIRE: ">=4.4"
14-
# 40x: Since symfony/monolog-bridge 5.2:
15-
# Passing an actionLevel (int|string) as constructor's 3rd argument of
16-
# "Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy"
17-
# is deprecated, "Monolog\Handler\FingersCrossed\ActivationStrategyInterface" expected.
18-
SYMFONY_DEPRECATIONS_HELPER: 40
13+
SYMFONY_REQUIRE: ">=6.0"
14+
SYMFONY_DEPRECATIONS_HELPER: 7
1915

2016
jobs:
2117
test:
@@ -26,12 +22,12 @@ jobs:
2622
strategy:
2723
matrix:
2824
operating-system: ['ubuntu-latest']
29-
php-version: ['8.0', '8.1']
25+
php-version: ['8.1']
3026
include:
3127
- operating-system: 'macos-latest'
32-
php-version: '8.0'
28+
php-version: '8.1'
3329
- operating-system: 'windows-latest'
34-
php-version: '8.0'
30+
php-version: '8.1'
3531

3632
steps:
3733
- name: "Checkout code"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can also learn about these practices in [the official Symfony Book][5].
99
Requirements
1010
------------
1111

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

composer.json

+28-29
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
"symfony/polyfill-php72": "*",
1010
"symfony/polyfill-php73": "*",
1111
"symfony/polyfill-php74": "*",
12-
"symfony/polyfill-php80": "*"
12+
"symfony/polyfill-php80": "*",
13+
"symfony/polyfill-php81": "*"
1314
},
1415
"require": {
15-
"php": ">=8.0.2",
16+
"php": ">=8.1",
1617
"ext-pdo_sqlite": "*",
1718
"doctrine/dbal": "^3.1",
1819
"doctrine/doctrine-bundle": "^2.5",
@@ -21,26 +22,27 @@
2122
"league/commonmark": "^2.1",
2223
"sensio/framework-extra-bundle": "^6.2",
2324
"symfony/apache-pack": "^1.0",
24-
"symfony/asset": "^6.0",
25-
"symfony/console": "^6.0",
26-
"symfony/dotenv": "^6.0",
27-
"symfony/expression-language": "^6.0",
25+
"symfony/asset": "^6.1",
26+
"symfony/console": "^6.1",
27+
"symfony/dotenv": "^6.1",
28+
"symfony/expression-language": "^6.1",
2829
"symfony/flex": "^2.0",
29-
"symfony/form": "^6.0",
30-
"symfony/framework-bundle": "^6.0",
31-
"symfony/intl": "^6.0",
32-
"symfony/mailer": "^6.0",
30+
"symfony/form": "^6.1",
31+
"symfony/framework-bundle": "^6.1",
32+
"symfony/html-sanitizer": "^6.1",
33+
"symfony/http-client": "^6.1",
34+
"symfony/intl": "^6.1",
35+
"symfony/mailer": "^6.1",
3336
"symfony/monolog-bundle": "^3.7",
3437
"symfony/polyfill-intl-messageformatter": "^1.12",
35-
"symfony/runtime": "^6.0",
36-
"symfony/security-bundle": "^6.0",
37-
"symfony/string": "^6.0",
38-
"symfony/translation": "^6.0",
39-
"symfony/twig-bundle": "^6.0",
40-
"symfony/validator": "^6.0",
38+
"symfony/runtime": "^6.1",
39+
"symfony/security-bundle": "^6.1",
40+
"symfony/string": "^6.1",
41+
"symfony/translation": "^6.1",
42+
"symfony/twig-bundle": "^6.1",
43+
"symfony/validator": "^6.1",
4144
"symfony/webpack-encore-bundle": "^1.13",
42-
"symfony/yaml": "^6.0",
43-
"tgalopin/html-sanitizer-bundle": "^1.4",
45+
"symfony/yaml": "^6.1",
4446
"twig/extra-bundle": "^3.3",
4547
"twig/intl-extra": "^3.3",
4648
"twig/markdown-extra": "^3.3"
@@ -49,17 +51,17 @@
4951
"dama/doctrine-test-bundle": "^7.0",
5052
"doctrine/doctrine-fixtures-bundle": "^3.4",
5153
"phpstan/phpstan": "^1.2",
52-
"symfony/browser-kit": "^6.0",
53-
"symfony/css-selector": "^6.0",
54-
"symfony/debug-bundle": "^6.0",
54+
"symfony/browser-kit": "^6.1",
55+
"symfony/css-selector": "^6.1",
56+
"symfony/debug-bundle": "^6.1",
5557
"symfony/maker-bundle": "^1.36",
56-
"symfony/phpunit-bridge": "^6.0",
57-
"symfony/stopwatch": "^6.0",
58-
"symfony/web-profiler-bundle": "^6.0"
58+
"symfony/phpunit-bridge": "^6.1",
59+
"symfony/stopwatch": "^6.1",
60+
"symfony/web-profiler-bundle": "^6.1"
5961
},
6062
"config": {
6163
"platform": {
62-
"php": "8.0.2"
64+
"php": "8.1.0"
6365
},
6466
"preferred-install": {
6567
"*": "dist"
@@ -93,13 +95,10 @@
9395
"@auto-scripts"
9496
]
9597
},
96-
"conflict": {
97-
"symfony/symfony": "*"
98-
},
9998
"extra": {
10099
"symfony": {
101100
"allow-contrib": true,
102-
"require": "6.0.*"
101+
"require": "6.1.*"
103102
}
104103
}
105104
}

0 commit comments

Comments
 (0)