Skip to content

Commit

Permalink
Allow Symfony 7 (see #7279)
Browse files Browse the repository at this point in the history
Description
-----------

5.3 LTS requires Symfony 6.4 LTS as per our roadmap.

This means, Contao 5.4 must allow Symfony 7 components.

Dependencies:

- [x] `contao/manager-plugin`: contao/manager-plugin#56
- [x] `contao/image`: contao/image#104
- [x] `terminal42/service-annotation-bundle`: terminal42/service-annotation-bundle#9
- [x] `terminal42/escargot`: terminal42/escargot#36
- [x] Merge contao/contao#7285 in `5.3`and then uptream into `5.x`

Commits
-------

0aa8323a Allow Symfony 7 in all packages
277005c0 Update to nikic/php-parser v5 in order to fix PHP incompatiblity issues
1eb7d8b2 Fixed test incompatibilities
a4eb15d6 Fixed DoctrineSchemaListener
a19c436e Fixed phpstan
af07922f Update calendar-bundle/composer.json
103d01e2 Update scheb/2fa bundles
01dca93a Fix interface incompatibility
15ebe558 Updated FOS HttpCache related dependencies
d18e73bd Apply suggestions from code review
aef96c3b Fixed the LocaleSubscriberTest
5aef4aad Revert changes
ade83931 Cleanup
0c2b1713 Use the existing news bundle when installing the core bundle in the "…

Co-authored-by: leofeyer <1192057+leofeyer@users.noreply.github.com>
  • Loading branch information
Toflar and leofeyer authored Jun 25, 2024
1 parent 071ee55 commit 973af30
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
54 changes: 27 additions & 27 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,36 @@
"contao/manager-plugin": "^2.4",
"doctrine/dbal": "^3.6",
"doctrine/doctrine-bundle": "^2.8",
"friendsofsymfony/http-cache": "^2.6",
"friendsofsymfony/http-cache-bundle": "^2.6",
"friendsofsymfony/http-cache": "^3.0",
"friendsofsymfony/http-cache-bundle": "^3.0",
"nelmio/cors-bundle": "^2.0.1",
"nelmio/security-bundle": "^2.2 || ^3.0",
"symfony/cache": "^6.4",
"symfony/config": "^6.4",
"symfony/console": "^6.4",
"symfony/debug-bundle": "^6.4",
"symfony/dependency-injection": "^6.4",
"symfony/cache": "^6.4 || ^7.0",
"symfony/config": "^6.4 || ^7.0",
"symfony/console": "^6.4 || ^7.0",
"symfony/debug-bundle": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/deprecation-contracts": "^3.0",
"symfony/doctrine-bridge": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/error-handler": "^6.4",
"symfony/expression-language": "^6.4",
"symfony/filesystem": "^6.4",
"symfony/finder": "^6.4",
"symfony/framework-bundle": "^6.4",
"symfony/http-client": "^6.4",
"symfony/http-foundation": "^6.4",
"symfony/http-kernel": "^6.4",
"symfony/mailer": "^6.4",
"symfony/monolog-bridge": "^6.4",
"symfony/doctrine-bridge": "^6.4 || ^7.0",
"symfony/dotenv": "^6.4 || ^7.0",
"symfony/error-handler": "^6.4 || ^7.0",
"symfony/expression-language": "^6.4 || ^7.0",
"symfony/filesystem": "^6.4 || ^7.0",
"symfony/finder": "^6.4 || ^7.0",
"symfony/framework-bundle": "^6.4 || ^7.0",
"symfony/http-client": "^6.4 || ^7.0",
"symfony/http-foundation": "^6.4 || ^7.0",
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/mailer": "^6.4 || ^7.0",
"symfony/monolog-bridge": "^6.4 || ^7.0",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "^6.4",
"symfony/routing": "^6.4",
"symfony/security-bundle": "^6.4",
"symfony/stopwatch": "^6.4",
"symfony/twig-bundle": "^6.4",
"symfony/web-profiler-bundle": "^6.4",
"symfony/yaml": "^6.4",
"symfony/process": "^6.4 || ^7.0",
"symfony/routing": "^6.4 || ^7.0",
"symfony/security-bundle": "^6.4 || ^7.0",
"symfony/stopwatch": "^6.4 || ^7.0",
"symfony/twig-bundle": "^6.4 || ^7.0",
"symfony/web-profiler-bundle": "^6.4 || ^7.0",
"symfony/yaml": "^6.4 || ^7.0",
"toflar/psr6-symfony-http-cache-store": "^4.0",
"twig/extra-bundle": "^3.0"
},
Expand All @@ -71,7 +71,7 @@
"contao/test-case": "self.version",
"contao/news-bundle": "self.version",
"phpunit/phpunit": "^9.5",
"symfony/phpunit-bridge": "^6.4"
"symfony/phpunit-bridge": "^6.4 || ^7.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 0 additions & 2 deletions skeleton/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ fos_http_cache:
enabled: true
tags:
enabled: true
annotations:
enabled: false
max_header_value_length: 4096

# Scheb 2FA configuration
Expand Down

0 comments on commit 973af30

Please sign in to comment.