Skip to content

Commit

Permalink
feature #1339 Upgrade to Symfony 6.1 (javiereguiluz)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
javiereguiluz committed Jun 21, 2022
2 parents c307b2a + e79b100 commit 096896f
Show file tree
Hide file tree
Showing 28 changed files with 1,197 additions and 1,002 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
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
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
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
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": "*",
"symfony/polyfill-php81": "*"
},
"require": {
"php": ">=8.0.2",
"php": ">=8.1",
"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

0 comments on commit 096896f

Please sign in to comment.