From 3a1925343fda125dfcedacb66c5255018593be2a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 12 May 2021 22:17:19 +0200 Subject: [PATCH 01/16] [FrameworkBundle] Add autowiring alias for `HttpCache\StoreInterface` --- src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md | 5 +++++ .../Bundle/FrameworkBundle/Resources/config/services.php | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 4d67ff130d983..435fa83445071 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +5.4 +--- + + * Add autowiring alias for `HttpCache\StoreInterface` + 5.3 --- diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php index c78faddba2d25..a26dfb5adc612 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php @@ -34,6 +34,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter; use Symfony\Component\HttpKernel\EventListener\LocaleAwareListener; use Symfony\Component\HttpKernel\HttpCache\Store; +use Symfony\Component\HttpKernel\HttpCache\StoreInterface; use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\KernelEvents; @@ -104,6 +105,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : [] ->args([ param('kernel.cache_dir').'/http_cache', ]) + ->alias(StoreInterface::class, 'http_cache.store') ->set('url_helper', UrlHelper::class) ->args([ From 8f595ec78ecec6e0d4a744917c748ac089b6ed40 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 19 May 2021 14:50:01 +0200 Subject: [PATCH 02/16] Update version to 5.4 --- src/Symfony/Component/HttpKernel/Kernel.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 330ca1ef85c7d..238c1d768660f 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -75,15 +75,15 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '5.3.0-DEV'; - public const VERSION_ID = 50300; + public const VERSION = '5.4.0-DEV'; + public const VERSION_ID = 50400; public const MAJOR_VERSION = 5; - public const MINOR_VERSION = 3; + public const MINOR_VERSION = 4; public const RELEASE_VERSION = 0; public const EXTRA_VERSION = 'DEV'; - public const END_OF_MAINTENANCE = '05/2021'; - public const END_OF_LIFE = '01/2022'; + public const END_OF_MAINTENANCE = '11/2024'; + public const END_OF_LIFE = '11/2025'; public function __construct(string $environment, bool $debug) { From f0c3389ea6d95d14e6700d7e7bb70fb85708eab4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 19 May 2021 16:12:59 +0200 Subject: [PATCH 03/16] Add sponsors for 5.4 --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index d3f5b5588d75a..3018a1f9f2b88 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,17 @@ Installation Support" (LTS) versions and has a [release process][6] that is predictable and business-friendly. +Sponsor +------- + +Symfony 5.4 is [backed][27] by [Private Packagist][28]. + +Private Packagist is a fast, reliable, and secure Composer repository for your +private packages. It mirrors all your open-source dependencies for better +availability and monitors them for security vulnerabilities. + +Help Symfony by [sponsoring][29] its development! + Documentation ------------- @@ -76,3 +87,6 @@ Symfony development is sponsored by [SensioLabs][21], led by the [24]: https://symfony.com/coc [25]: https://symfony.com/doc/current/contributing/code_of_conduct/care_team.html [26]: https://symfony.com/book +[27]: https://symfony.com/backers +[28]: https://packagist.com/ +[29]: https://symfony.com/sponsor From 49a103023796bcd4479c8138922c45136ba96855 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 19 May 2021 16:32:07 +0200 Subject: [PATCH 04/16] Remove 5.3 sponsors --- README.md | 14 -------------- src/Symfony/Component/Routing/README.md | 15 --------------- 2 files changed, 29 deletions(-) diff --git a/README.md b/README.md index 52860457b2336..0420afac75bd9 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,6 @@ Installation Support" (LTS) versions and has a [release process][6] that is predictable and business-friendly. -Sponsor -------- - -Symfony 5.3 is [backed][27] by [JoliCode][28]. - -JoliCode is a team of passionate developers and open-source lovers, with a -strong expertise in PHP & Symfony technologies. They can help you build your -projects using state-of-the-art practices. - -Help Symfony by [sponsoring][29] its development! - Documentation ------------- @@ -86,6 +75,3 @@ Symfony development is sponsored by [SensioLabs][21], led by the [24]: https://symfony.com/coc [25]: https://symfony.com/doc/current/contributing/code_of_conduct/care_team.html [26]: https://symfony.com/book -[27]: https://symfony.com/backers -[28]: https://jolicode.com/ -[29]: https://symfony.com/sponsor diff --git a/src/Symfony/Component/Routing/README.md b/src/Symfony/Component/Routing/README.md index 9958303febb68..03b258ec8203b 100644 --- a/src/Symfony/Component/Routing/README.md +++ b/src/Symfony/Component/Routing/README.md @@ -41,17 +41,6 @@ $url = $generator->generate('blog_show', [ // $url = '/blog/my-blog-post' ``` -Sponsor -------- - -The Routing component for Symfony 5.3 is [backed][1] by [redirection.io][2]. - -redirection.io logs all your website’s HTTP traffic, and lets you fix errors -with redirect rules in seconds. Give your marketing, SEO and IT teams the right -tool to manage your website traffic efficiently! - -Help Symfony by [sponsoring][3] its development! - Resources --------- @@ -60,7 +49,3 @@ Resources * [Report issues](https://github.com/symfony/symfony/issues) and [send Pull Requests](https://github.com/symfony/symfony/pulls) in the [main Symfony repository](https://github.com/symfony/symfony) - -[1]: https://symfony.com/backers -[2]: https://redirection.io/ -[3]: https://symfony.com/sponsor From d6f4d3047b110656ce22a32d6fbfed199e8a6ff6 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 19 May 2021 19:27:11 +0200 Subject: [PATCH 05/16] Fix the detection of the stable Symfony branch --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7edbbe525e745..ce8da3e8f80c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,8 @@ before_install: export COMPOSER_UP='composer update --no-progress --ansi' export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort) export SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170 - export SYMFONY_FEATURE_BRANCH=$(curl -s https://flex.symfony.com/versions.json | jq -r '."dev-name"') + export SYMFONY_FLEX_VERSIONS=$(curl -s https://flex.symfony.com/versions.json) + export SYMFONY_FEATURE_BRANCH=$(echo $SYMFONY_FLEX_VERSIONS | jq -r '."dev"') nanoseconds () { local cmd="date" @@ -204,7 +205,10 @@ install: # For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components if [[ $deps = high && $TRAVIS_BRANCH = $SYMFONY_FEATURE_BRANCH ]]; then export FLIP='^' - export SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) && + export SYMFONY_VERSION=$(echo $SYMFONY_FLEX_VERSIONS | jq -r '."next"') + if [ $SYMFONY_VERSION = $SYMFONY_FEATURE_BRANCH ]; then + export SYMFONY_VERSION = $(echo $SYMFONY_FLEX_VERSIONS | jq -r '."stable"') + fi git fetch --depth=2 origin $SYMFONY_VERSION && git checkout -m FETCH_HEAD && export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort) From 2da144ef52bde9bc23147ea9c12ba4867c497a1b Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 19 May 2021 18:46:45 +0200 Subject: [PATCH 06/16] Allow Symfony 6 --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 34 ++--- src/Symfony/Bridge/Monolog/composer.json | 16 +- src/Symfony/Bridge/PhpUnit/composer.json | 2 +- src/Symfony/Bridge/ProxyManager/composer.json | 4 +- src/Symfony/Bridge/Twig/composer.json | 42 +++--- src/Symfony/Bundle/DebugBundle/composer.json | 12 +- .../Bundle/FrameworkBundle/composer.json | 140 +++++++++--------- .../Bundle/SecurityBundle/composer.json | 54 +++---- src/Symfony/Bundle/TwigBundle/composer.json | 30 ++-- .../Bundle/WebProfilerBundle/composer.json | 18 +-- src/Symfony/Component/Asset/composer.json | 6 +- .../Component/BrowserKit/composer.json | 10 +- src/Symfony/Component/Cache/composer.json | 14 +- src/Symfony/Component/Config/composer.json | 10 +- src/Symfony/Component/Console/composer.json | 14 +- .../DependencyInjection/composer.json | 6 +- .../Component/DomCrawler/composer.json | 2 +- src/Symfony/Component/Dotenv/composer.json | 2 +- .../Component/ErrorHandler/composer.json | 6 +- .../Component/EventDispatcher/composer.json | 12 +- .../ExpressionLanguage/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 30 ++-- .../Component/HttpClient/composer.json | 8 +- .../Component/HttpFoundation/composer.json | 6 +- .../Component/HttpKernel/composer.json | 30 ++-- src/Symfony/Component/Inflector/composer.json | 2 +- src/Symfony/Component/Intl/composer.json | 2 +- src/Symfony/Component/Ldap/composer.json | 4 +- .../Mailer/Bridge/Amazon/composer.json | 4 +- .../Mailer/Bridge/Google/composer.json | 4 +- .../Mailer/Bridge/Mailchimp/composer.json | 4 +- .../Mailer/Bridge/Mailgun/composer.json | 4 +- .../Mailer/Bridge/Mailjet/composer.json | 4 +- .../Mailer/Bridge/Postmark/composer.json | 4 +- .../Mailer/Bridge/Sendgrid/composer.json | 4 +- .../Mailer/Bridge/Sendinblue/composer.json | 4 +- src/Symfony/Component/Mailer/composer.json | 6 +- .../Messenger/Bridge/AmazonSqs/composer.json | 6 +- .../Messenger/Bridge/Amqp/composer.json | 10 +- .../Messenger/Bridge/Beanstalkd/composer.json | 6 +- .../Messenger/Bridge/Doctrine/composer.json | 6 +- .../Messenger/Bridge/Redis/composer.json | 6 +- src/Symfony/Component/Messenger/composer.json | 26 ++-- src/Symfony/Component/Mime/composer.json | 8 +- .../Notifier/Bridge/AllMySms/composer.json | 4 +- .../Notifier/Bridge/Clickatell/composer.json | 6 +- .../Notifier/Bridge/Discord/composer.json | 6 +- .../Notifier/Bridge/Esendex/composer.json | 4 +- .../Notifier/Bridge/FakeChat/composer.json | 6 +- .../Notifier/Bridge/FakeSms/composer.json | 6 +- .../Notifier/Bridge/Firebase/composer.json | 4 +- .../Notifier/Bridge/FreeMobile/composer.json | 4 +- .../Notifier/Bridge/GatewayApi/composer.json | 4 +- .../Notifier/Bridge/Gitter/composer.json | 4 +- .../Notifier/Bridge/GoogleChat/composer.json | 4 +- .../Notifier/Bridge/Infobip/composer.json | 4 +- .../Notifier/Bridge/Iqsms/composer.json | 4 +- .../Notifier/Bridge/LightSms/composer.json | 4 +- .../Notifier/Bridge/LinkedIn/composer.json | 4 +- .../Notifier/Bridge/Mattermost/composer.json | 4 +- .../Notifier/Bridge/Mercure/composer.json | 2 +- .../Notifier/Bridge/MessageBird/composer.json | 4 +- .../Bridge/MicrosoftTeams/composer.json | 4 +- .../Notifier/Bridge/Mobyt/composer.json | 4 +- .../Notifier/Bridge/Nexmo/composer.json | 4 +- .../Notifier/Bridge/Octopush/composer.json | 4 +- .../Notifier/Bridge/OvhCloud/composer.json | 4 +- .../Notifier/Bridge/RocketChat/composer.json | 4 +- .../Notifier/Bridge/Sendinblue/composer.json | 4 +- .../Notifier/Bridge/Sinch/composer.json | 4 +- .../Notifier/Bridge/Slack/composer.json | 6 +- .../Notifier/Bridge/SmsBiuras/composer.json | 4 +- .../Notifier/Bridge/Smsapi/composer.json | 4 +- .../Notifier/Bridge/SpotHit/composer.json | 4 +- .../Notifier/Bridge/Telegram/composer.json | 6 +- .../Notifier/Bridge/Twilio/composer.json | 4 +- .../Notifier/Bridge/Zulip/composer.json | 4 +- src/Symfony/Component/Notifier/composer.json | 2 +- .../Component/PasswordHasher/composer.json | 2 +- .../Component/PropertyAccess/composer.json | 4 +- .../Component/PropertyInfo/composer.json | 8 +- .../Component/RateLimiter/composer.json | 4 +- src/Symfony/Component/Routing/composer.json | 10 +- src/Symfony/Component/Runtime/composer.json | 2 +- .../Component/Security/Core/composer.json | 16 +- .../Component/Security/Csrf/composer.json | 4 +- .../Component/Security/Guard/composer.json | 4 +- .../Component/Security/Http/composer.json | 18 +-- .../Component/Serializer/composer.json | 32 ++-- src/Symfony/Component/String/composer.json | 6 +- .../Translation/Bridge/Crowdin/composer.json | 6 +- .../Translation/Bridge/Loco/composer.json | 6 +- .../Translation/Bridge/Lokalise/composer.json | 6 +- .../Translation/Bridge/PoEditor/composer.json | 6 +- .../Component/Translation/composer.json | 14 +- src/Symfony/Component/Uid/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 30 ++-- src/Symfony/Component/VarDumper/composer.json | 4 +- .../Component/VarExporter/composer.json | 2 +- src/Symfony/Component/WebLink/composer.json | 2 +- src/Symfony/Component/Workflow/composer.json | 10 +- src/Symfony/Component/Yaml/composer.json | 2 +- 103 files changed, 485 insertions(+), 485 deletions(-) diff --git a/composer.json b/composer.json index 77b8c2b3795bb..3a3a398199647 100644 --- a/composer.json +++ b/composer.json @@ -143,7 +143,7 @@ "psr/simple-cache": "^1.0", "egulias/email-validator": "^2.1.10|^3.1", "symfony/mercure-bundle": "^0.3", - "symfony/phpunit-bridge": "^5.2", + "symfony/phpunit-bridge": "^5.2|^6.0", "symfony/security-acl": "~2.8|~3.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "twig/cssinliner-extra": "^2.12|^3", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 75db8e99e7700..db34a6c40d31a 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -27,23 +27,23 @@ }, "require-dev": { "composer/package-versions-deprecated": "^1.8", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/cache": "^5.1", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/form": "^5.1.3", - "symfony/http-kernel": "^5.0", - "symfony/messenger": "^4.4|^5.0", - "symfony/doctrine-messenger": "^5.1", - "symfony/property-access": "^4.4|^5.0", - "symfony/property-info": "^5.0", - "symfony/proxy-manager-bridge": "^4.4|^5.0", - "symfony/security-core": "^5.3", - "symfony/expression-language": "^4.4|^5.0", - "symfony/uid": "^5.1", - "symfony/validator": "^5.2", - "symfony/translation": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/cache": "^5.1|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/form": "^5.1.3|^6.0", + "symfony/http-kernel": "^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/doctrine-messenger": "^5.1|^6.0", + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/property-info": "^5.0|^6.0", + "symfony/proxy-manager-bridge": "^4.4|^5.0|^6.0", + "symfony/security-core": "^5.3|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/uid": "^5.1|^6.0", + "symfony/validator": "^5.2|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0", "doctrine/annotations": "^1.10.4", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index b7cc4f200af58..41a5066f87b5d 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -19,17 +19,17 @@ "php": ">=7.2.5", "monolog/monolog": "^1.25.1|^2", "symfony/service-contracts": "^1.1|^2", - "symfony/http-kernel": "^5.3", + "symfony/http-kernel": "^5.3|^6.0", "symfony/deprecation-contracts": "^2.1" }, "require-dev": { - "symfony/console": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/security-core": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", - "symfony/mailer": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/messenger": "^4.4|^5.0" + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/security-core": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0", + "symfony/mailer": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/console": "<4.4", diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json index 00dc40452757c..60b5ac6fb4802 100644 --- a/src/Symfony/Bridge/PhpUnit/composer.json +++ b/src/Symfony/Bridge/PhpUnit/composer.json @@ -22,7 +22,7 @@ "symfony/deprecation-contracts": "^2.1" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0" + "symfony/error-handler": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 145ac6880f828..987428a066d1d 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -19,10 +19,10 @@ "php": ">=7.2.5", "composer/package-versions-deprecated": "^1.8", "friendsofphp/proxy-manager-lts": "^1.0.2", - "symfony/dependency-injection": "^5.0" + "symfony/dependency-injection": "^5.0|^6.0" }, "require-dev": { - "symfony/config": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }, diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index f4e70b09066e0..5a0735e250df2 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -25,29 +25,29 @@ "doctrine/annotations": "^1.12", "egulias/email-validator": "^2.1.10|^3", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/asset": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/form": "^5.3", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/intl": "^4.4|^5.0", - "symfony/mime": "^5.2", + "symfony/asset": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/form": "^5.3|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/mime": "^5.2|^6.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/property-info": "^4.4|^5.1", - "symfony/routing": "^4.4|^5.0", - "symfony/translation": "^5.2", - "symfony/yaml": "^4.4|^5.0", + "symfony/property-info": "^4.4|^5.1|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/translation": "^5.2|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", "symfony/security-acl": "^2.8|^3.0", - "symfony/security-core": "^4.4|^5.0", - "symfony/security-csrf": "^4.4|^5.0", - "symfony/security-http": "^4.4|^5.0", - "symfony/serializer": "^5.2", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/web-link": "^4.4|^5.0", - "symfony/workflow": "^5.2", + "symfony/security-core": "^4.4|^5.0|^6.0", + "symfony/security-csrf": "^4.4|^5.0|^6.0", + "symfony/security-http": "^4.4|^5.0|^6.0", + "symfony/serializer": "^5.2|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/web-link": "^4.4|^5.0|^6.0", + "symfony/workflow": "^5.2|^6.0", "twig/cssinliner-extra": "^2.12|^3", "twig/inky-extra": "^2.12|^3", "twig/markdown-extra": "^2.12|^3" diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json index b69ec5c7681b2..65f6a06887c83 100644 --- a/src/Symfony/Bundle/DebugBundle/composer.json +++ b/src/Symfony/Bundle/DebugBundle/composer.json @@ -18,14 +18,14 @@ "require": { "php": ">=7.2.5", "ext-xml": "*", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/twig-bridge": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/twig-bridge": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/web-profiler-bundle": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/web-profiler-bundle": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/config": "<4.4", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 3417c7ce64b32..8ea556ef29732 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -18,88 +18,88 @@ "require": { "php": ">=7.2.5", "ext-xml": "*", - "symfony/cache": "^5.2", - "symfony/config": "^5.3", - "symfony/dependency-injection": "^5.3", + "symfony/cache": "^5.2|^6.0", + "symfony/config": "^5.3|^6.0", + "symfony/dependency-injection": "^5.3|^6.0", "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher": "^5.1", - "symfony/error-handler": "^4.4.1|^5.0.1", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^5.3", + "symfony/event-dispatcher": "^5.1|^6.0", + "symfony/error-handler": "^4.4.1|^5.0.1|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/http-kernel": "^5.3|^6.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.15", - "symfony/filesystem": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/routing": "^5.3" + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/routing": "^5.3|^6.0" }, "require-dev": { "doctrine/annotations": "^1.10.4", "doctrine/cache": "^1.0|^2.0", "doctrine/persistence": "^1.3|^2.0", - "symfony/asset": "^5.3", - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^5.2", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/dotenv": "^5.1", + "symfony/asset": "^5.3|^6.0", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/console": "^5.2|^6.0", + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/dotenv": "^5.1|^6.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/form": "^5.2", - "symfony/expression-language": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/mailer": "^5.2", - "symfony/messenger": "^5.2", - "symfony/mime": "^4.4|^5.0", - "symfony/notifier": "^5.3", - "symfony/allmysms-notifier": "^5.3", - "symfony/clickatell-notifier": "^5.3", - "symfony/discord-notifier": "^5.3", - "symfony/esendex-notifier": "^5.3", - "symfony/fake-chat-notifier": "^5.3", - "symfony/fake-sms-notifier": "^5.3", - "symfony/firebase-notifier": "^5.3", - "symfony/free-mobile-notifier": "^5.3", - "symfony/gatewayapi-notifier": "^5.3", - "symfony/gitter-notifier": "^5.3", - "symfony/google-chat-notifier": "^5.3", - "symfony/infobip-notifier": "^5.3", - "symfony/iqsms-notifier": "^5.3", - "symfony/light-sms-notifier": "^5.3", - "symfony/linked-in-notifier": "^5.3", - "symfony/mattermost-notifier": "^5.3", - "symfony/message-bird-notifier": "^5.3", - "symfony/microsoft-teams-notifier": "^5.3", - "symfony/mobyt-notifier": "^5.3", - "symfony/nexmo-notifier": "^5.3", - "symfony/octopush-notifier": "^5.3", - "symfony/ovh-cloud-notifier": "^5.3", - "symfony/rocket-chat-notifier": "^5.3", - "symfony/sendinblue-notifier": "^5.3", - "symfony/sinch-notifier": "^5.3", - "symfony/slack-notifier": "^5.3", - "symfony/smsapi-notifier": "^5.3", - "symfony/sms-biuras-notifier": "^5.3", - "symfony/spot-hit-notifier": "^5.3", - "symfony/telegram-notifier": "^5.3", - "symfony/twilio-notifier": "^5.3", - "symfony/zulip-notifier": "^5.3", - "symfony/process": "^4.4|^5.0", - "symfony/rate-limiter": "^5.2", - "symfony/security-bundle": "^5.3", - "symfony/serializer": "^5.2", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/string": "^5.0", - "symfony/translation": "^5.3", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/validator": "^5.2", - "symfony/workflow": "^5.2", - "symfony/yaml": "^4.4|^5.0", - "symfony/property-info": "^4.4|^5.0", - "symfony/web-link": "^4.4|^5.0", + "symfony/form": "^5.2|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/mailer": "^5.2|^6.0", + "symfony/messenger": "^5.2|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0", + "symfony/allmysms-notifier": "^5.3|^6.0", + "symfony/clickatell-notifier": "^5.3|^6.0", + "symfony/discord-notifier": "^5.3|^6.0", + "symfony/esendex-notifier": "^5.3|^6.0", + "symfony/fake-chat-notifier": "^5.3|^6.0", + "symfony/fake-sms-notifier": "^5.3|^6.0", + "symfony/firebase-notifier": "^5.3|^6.0", + "symfony/free-mobile-notifier": "^5.3|^6.0", + "symfony/gatewayapi-notifier": "^5.3|^6.0", + "symfony/gitter-notifier": "^5.3|^6.0", + "symfony/google-chat-notifier": "^5.3|^6.0", + "symfony/infobip-notifier": "^5.3|^6.0", + "symfony/iqsms-notifier": "^5.3|^6.0", + "symfony/light-sms-notifier": "^5.3|^6.0", + "symfony/linked-in-notifier": "^5.3|^6.0", + "symfony/mattermost-notifier": "^5.3|^6.0", + "symfony/message-bird-notifier": "^5.3|^6.0", + "symfony/microsoft-teams-notifier": "^5.3|^6.0", + "symfony/mobyt-notifier": "^5.3|^6.0", + "symfony/nexmo-notifier": "^5.3|^6.0", + "symfony/octopush-notifier": "^5.3|^6.0", + "symfony/ovh-cloud-notifier": "^5.3|^6.0", + "symfony/rocket-chat-notifier": "^5.3|^6.0", + "symfony/sendinblue-notifier": "^5.3|^6.0", + "symfony/sinch-notifier": "^5.3|^6.0", + "symfony/slack-notifier": "^5.3|^6.0", + "symfony/smsapi-notifier": "^5.3|^6.0", + "symfony/sms-biuras-notifier": "^5.3|^6.0", + "symfony/spot-hit-notifier": "^5.3|^6.0", + "symfony/telegram-notifier": "^5.3|^6.0", + "symfony/twilio-notifier": "^5.3|^6.0", + "symfony/zulip-notifier": "^5.3|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0", + "symfony/security-bundle": "^5.3|^6.0", + "symfony/serializer": "^5.2|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/string": "^5.0|^6.0", + "symfony/translation": "^5.3|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/validator": "^5.2|^6.0", + "symfony/workflow": "^5.2|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/property-info": "^4.4|^5.0|^6.0", + "symfony/web-link": "^4.4|^5.0|^6.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "paragonie/sodium_compat": "^1.8", "twig/twig": "^2.10|^3.0", - "symfony/phpunit-bridge": "^5.3" + "symfony/phpunit-bridge": "^5.3|^6.0" }, "conflict": { "doctrine/persistence": "<1.3", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 761b3dbe172f7..d037f3bb81385 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -18,38 +18,38 @@ "require": { "php": ">=7.2.5", "ext-xml": "*", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^5.3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.3|^6.0", "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher": "^5.1", - "symfony/http-kernel": "^5.3", - "symfony/http-foundation": "^5.3", - "symfony/password-hasher": "^5.3", + "symfony/event-dispatcher": "^5.1|^6.0", + "symfony/http-kernel": "^5.3|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/password-hasher": "^5.3|^6.0", "symfony/polyfill-php80": "^1.15", - "symfony/security-core": "^5.3", - "symfony/security-csrf": "^4.4|^5.0", - "symfony/security-guard": "^5.3", - "symfony/security-http": "^5.3" + "symfony/security-core": "^5.3|^6.0", + "symfony/security-csrf": "^4.4|^5.0|^6.0", + "symfony/security-guard": "^5.3|^6.0", + "symfony/security-http": "^5.3|^6.0" }, "require-dev": { "doctrine/doctrine-bundle": "^2.0", - "symfony/asset": "^4.4|^5.0", - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/form": "^4.4|^5.0", - "symfony/framework-bundle": "^5.3", - "symfony/ldap": "^5.3", - "symfony/process": "^4.4|^5.0", - "symfony/rate-limiter": "^5.2", - "symfony/serializer": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/twig-bridge": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0", + "symfony/asset": "^4.4|^5.0|^6.0", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/form": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^5.3|^6.0", + "symfony/ldap": "^5.3|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/twig-bridge": "^4.4|^5.0|^6.0", + "symfony/validator": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", "twig/twig": "^2.13|^3.0.4" }, "conflict": { diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 1d9b1cb12eac9..128047bc46853 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -17,25 +17,25 @@ ], "require": { "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0", - "symfony/twig-bridge": "^5.3", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/http-kernel": "^5.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/twig-bridge": "^5.3|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^5.0|^6.0", "symfony/polyfill-ctype": "~1.8", "twig/twig": "^2.13|^3.0.4" }, "require-dev": { - "symfony/asset": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/dependency-injection": "^5.3", - "symfony/expression-language": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/form": "^4.4|^5.0", - "symfony/routing": "^4.4|^5.0", - "symfony/translation": "^5.0", - "symfony/yaml": "^4.4|^5.0", - "symfony/framework-bundle": "^5.0", - "symfony/web-link": "^4.4|^5.0", + "symfony/asset": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.3|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/form": "^4.4|^5.0|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/translation": "^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^5.0|^6.0", + "symfony/web-link": "^4.4|^5.0|^6.0", "doctrine/annotations": "^1.10.4", "doctrine/cache": "^1.0|^2.0" }, diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 83b29f97746a0..8960d71a9f519 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -17,18 +17,18 @@ ], "require": { "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0", - "symfony/framework-bundle": "^5.3", - "symfony/http-kernel": "^5.3", - "symfony/routing": "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^5.3|^6.0", + "symfony/http-kernel": "^5.3|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", "twig/twig": "^2.13|^3.0.4" }, "require-dev": { - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/css-selector": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0" + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/form": "<4.4", diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json index ff6b93d720ebc..3b901373d48bb 100644 --- a/src/Symfony/Component/Asset/composer.json +++ b/src/Symfony/Component/Asset/composer.json @@ -23,9 +23,9 @@ "symfony/http-foundation": "" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/http-foundation": "<5.3" diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 239b8faa1b037..90d649be8b864 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -17,13 +17,13 @@ ], "require": { "php": ">=7.2.5", - "symfony/dom-crawler": "^4.4|^5.0" + "symfony/dom-crawler": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/css-selector": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0" + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/process": "" diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index 6917879105179..ff83d06bf6112 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -28,7 +28,7 @@ "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "require-dev": { "cache/integration-tests": "dev-master", @@ -36,12 +36,12 @@ "doctrine/dbal": "^2.10|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/filesystem": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/messenger": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "conflict": { "doctrine/dbal": "<2.10", diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 1e5a96f360688..e11067824c8ce 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -18,16 +18,16 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/filesystem": "^4.4|^5.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/messenger": "^4.4|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^4.4|^5.0" + "symfony/yaml": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/finder": "<4.4" diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index fa720142ae676..149b5848bb1b2 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -22,15 +22,15 @@ "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/string": "^5.1|^6.0" }, "require-dev": { - "symfony/config": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0", "psr/log": "~1.0" }, "provide": { diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 65777679cd7ce..c98ef84ffe5b6 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -23,9 +23,9 @@ "symfony/service-contracts": "^1.1.6|^2" }, "require-dev": { - "symfony/yaml": "^4.4|^5.0", - "symfony/config": "^5.3", - "symfony/expression-language": "^4.4|^5.0" + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/config": "^5.3|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/yaml": "", diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 8c430824fe9f0..59d27dd698142 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -23,7 +23,7 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/css-selector": "^4.4|^5.0", + "symfony/css-selector": "^4.4|^5.0|^6.0", "masterminds/html5": "^2.6" }, "conflict": { diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json index de8ec159740f5..9bd6cda177f1c 100644 --- a/src/Symfony/Component/Dotenv/composer.json +++ b/src/Symfony/Component/Dotenv/composer.json @@ -20,7 +20,7 @@ "symfony/deprecation-contracts": "^2.1" }, "require-dev": { - "symfony/process": "^4.4|^5.0" + "symfony/process": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Dotenv\\": "" }, diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json index baebf40dd7105..7bfda8a9f971e 100644 --- a/src/Symfony/Component/ErrorHandler/composer.json +++ b/src/Symfony/Component/ErrorHandler/composer.json @@ -19,11 +19,11 @@ "php": ">=7.2.5", "psr/log": "^1.0", "symfony/polyfill-php80": "^1.15", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/http-kernel": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0", "symfony/deprecation-contracts": "^2.1" }, "autoload": { diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 7d72ca37e40a5..73b0e62cdad86 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -22,13 +22,13 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/config": "^4.4|^5.0", - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json index 2e7585918355d..3274b09bdd2f8 100644 --- a/src/Symfony/Component/ExpressionLanguage/composer.json +++ b/src/Symfony/Component/ExpressionLanguage/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=7.2.5", - "symfony/cache": "^4.4|^5.0", + "symfony/cache": "^4.4|^5.0|^6.0", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1|^2" }, diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index b99e08620a8d0..ebfb83b3618cf 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -18,29 +18,29 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/options-resolver": "^5.1", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/options-resolver": "^5.1|^6.0", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-icu": "^1.21", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.15", - "symfony/property-access": "^5.0.8", + "symfony/property-access": "^5.0.8|^6.0", "symfony/service-contracts": "^1.1|^2" }, "require-dev": { "doctrine/collections": "~1.0", - "symfony/validator": "^4.4.17|^5.1.9", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/config": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/intl": "^4.4|^5.0", - "symfony/security-csrf": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", - "symfony/uid": "^5.1" + "symfony/validator": "^4.4.17|^5.1.9|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/security-csrf": "^4.4|^5.0|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0", + "symfony/uid": "^5.1|^6.0" }, "conflict": { "phpunit/phpunit": "<5.4.3", diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json index 98a1f22847ab7..4184c4a5d07f4 100644 --- a/src/Symfony/Component/HttpClient/composer.json +++ b/src/Symfony/Component/HttpClient/composer.json @@ -38,10 +38,10 @@ "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/http-kernel": "^4.4.13|^5.1.5", - "symfony/process": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0" + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpClient\\": "" }, diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 4137f21dd51fa..2068fc7c6aeee 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -23,9 +23,9 @@ }, "require-dev": { "predis/predis": "~1.0", - "symfony/cache": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0" + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0" }, "suggest" : { "symfony/mime": "To use the file extension guesser" diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index e5dd1db29870a..660c98fdfc619 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -18,28 +18,28 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/error-handler": "^4.4|^5.0", - "symfony/event-dispatcher": "^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^5.0|^6.0", "symfony/http-client-contracts": "^1.1|^2", - "symfony/http-foundation": "^5.3", + "symfony/http-foundation": "^5.3|^6.0", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.15", "psr/log": "~1.0" }, "require-dev": { - "symfony/browser-kit": "^4.4|^5.0", - "symfony/config": "^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dependency-injection": "^5.3", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/routing": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/config": "^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.3|^6.0", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", "psr/cache": "^1.0|^2.0|^3.0", "twig/twig": "^2.13|^3.0.4" diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/composer.json index 7aa7731d84801..578688870c171 100644 --- a/src/Symfony/Component/Inflector/composer.json +++ b/src/Symfony/Component/Inflector/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/string": "^5.2.8" + "symfony/string": "^5.2.8|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Inflector\\": "" }, diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index 4e4624c7468e6..33e81464e8341 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -29,7 +29,7 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/filesystem": "^4.4|^5.0" + "symfony/filesystem": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Intl\\": "" }, diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json index dc6b0a5d5a796..2ee70d32ba9c7 100644 --- a/src/Symfony/Component/Ldap/composer.json +++ b/src/Symfony/Component/Ldap/composer.json @@ -17,12 +17,12 @@ ], "require": { "php": ">=7.2.5", - "symfony/options-resolver": "^4.4|^5.0", + "symfony/options-resolver": "^4.4|^5.0|^6.0", "symfony/polyfill-php80": "^1.15", "ext-ldap": "*" }, "require-dev": { - "symfony/security-core": "^5.3" + "symfony/security-core": "^5.3|^6.0" }, "conflict": { "symfony/options-resolver": "<4.4", diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json index 5d2ea6bcb5cdb..ebc6d63abb0ca 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json @@ -19,10 +19,10 @@ "php": ">=7.2.5", "async-aws/ses": "^1.0", "symfony/deprecation-contracts": "^2.1", - "symfony/mailer": "^4.4.21|^5.2.6" + "symfony/mailer": "^4.4.21|^5.2.6|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Amazon\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Google/composer.json b/src/Symfony/Component/Mailer/Bridge/Google/composer.json index 01f259776531a..a5669e28f4160 100644 --- a/src/Symfony/Component/Mailer/Bridge/Google/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Google/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^4.4|^5.0" + "symfony/mailer": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Google\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json index 46cb8a7209977..4edfae73aa857 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^5.1" + "symfony/mailer": "^5.1|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailchimp\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json index 2e2534fff0251..d5268dbe988af 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json @@ -18,10 +18,10 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/mailer": "^5.2.6" + "symfony/mailer": "^5.2.6|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json index d0886476d8560..1d4f6d54767ff 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^4.4|^5.0" + "symfony/mailer": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailjet\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json index 4d27122ccafae..a1b4bf8703d0f 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^5.2.6" + "symfony/mailer": "^5.2.6|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json index 657b4bc631a82..293838286a3ef 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^4.4|^5.0" + "symfony/mailer": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sendgrid\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/composer.json b/src/Symfony/Component/Mailer/Bridge/Sendinblue/composer.json index 03eacc5c71f3a..03ede0f3d9216 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendinblue/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Sendinblue/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/mailer": "^5.1" + "symfony/mailer": "^5.1|^6.0" }, "require-dev": { - "symfony/http-client": "^4.4|^5.0" + "symfony/http-client": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sendinblue\\": "" }, diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json index 627b1f714cea7..7184be726857c 100644 --- a/src/Symfony/Component/Mailer/composer.json +++ b/src/Symfony/Component/Mailer/composer.json @@ -19,14 +19,14 @@ "php": ">=7.2.5", "egulias/email-validator": "^2.1.10|^3", "psr/log": "~1.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/mime": "^5.2.6", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/mime": "^5.2.6|^6.0", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1|^2" }, "require-dev": { "symfony/http-client-contracts": "^1.1|^2", - "symfony/messenger": "^4.4|^5.0" + "symfony/messenger": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/http-kernel": "<4.4" diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json index c9902ac1c3b23..b5700fa86eeb9 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json @@ -19,14 +19,14 @@ "php": ">=7.2.5", "async-aws/core": "^1.5", "async-aws/sqs": "^1.0", - "symfony/messenger": "^4.3|^5.0", + "symfony/messenger": "^4.3|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2", "psr/log": "^1.0" }, "require-dev": { "symfony/http-client-contracts": "^1.0|^2.0", - "symfony/property-access": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\AmazonSqs\\": "" }, diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/composer.json b/src/Symfony/Component/Messenger/Bridge/Amqp/composer.json index b5a4f04132187..933749f0ef93b 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/composer.json @@ -18,13 +18,13 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/messenger": "^5.3" + "symfony/messenger": "^5.3|^6.0" }, "require-dev": { - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\Amqp\\": "" }, diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/composer.json b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/composer.json index c082c1e7b02b3..cf4a61630f325 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/composer.json @@ -14,11 +14,11 @@ "require": { "php": ">=7.2.5", "pda/pheanstalk": "^4.0", - "symfony/messenger": "^4.4|^5.0" + "symfony/messenger": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/property-access": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\Beanstalkd\\": "" }, diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json index c36710e9d5031..07ce2a1ff0b50 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=7.2.5", - "symfony/messenger": "^5.1", + "symfony/messenger": "^5.1|^6.0", "symfony/service-contracts": "^1.1|^2" }, "require-dev": { "doctrine/dbal": "^2.10|^3.0", "doctrine/persistence": "^1.3|^2", - "symfony/property-access": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "conflict": { "doctrine/dbal": "<2.10", diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/composer.json b/src/Symfony/Component/Messenger/Bridge/Redis/composer.json index 11111598719b9..0e4655c0d7521 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Redis/composer.json @@ -18,11 +18,11 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/messenger": "^5.1" + "symfony/messenger": "^5.1|^6.0" }, "require-dev": { - "symfony/property-access": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\Redis\\": "" }, diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 0a5593cc7c694..abbd133f954a4 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -18,25 +18,25 @@ "require": { "php": ">=7.2.5", "psr/log": "~1.0", - "symfony/amqp-messenger": "^5.1", + "symfony/amqp-messenger": "^5.1|^6.0", "symfony/deprecation-contracts": "^2.1", - "symfony/doctrine-messenger": "^5.1", + "symfony/doctrine-messenger": "^5.1|^6.0", "symfony/polyfill-php80": "^1.15", - "symfony/redis-messenger": "^5.1" + "symfony/redis-messenger": "^5.1|^6.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", - "symfony/console": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.0", - "symfony/routing": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0" + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/validator": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/event-dispatcher": "<4.4", diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json index 22ba0ee046ec6..0dfdafdb9785d 100644 --- a/src/Symfony/Component/Mime/composer.json +++ b/src/Symfony/Component/Mime/composer.json @@ -25,10 +25,10 @@ "require-dev": { "egulias/email-validator": "^2.1.10|^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.1", - "symfony/property-info": "^4.4|^5.1", - "symfony/serializer": "^5.2" + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.1|^6.0", + "symfony/property-info": "^4.4|^5.1|^6.0", + "symfony/serializer": "^5.2|^6.0" }, "conflict": { "egulias/email-validator": "~3.0.0", diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json b/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json index 79704353acf41..403a00564cfd2 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\AllMySms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json b/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json index 404589753a52b..7cf67278b9208 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json @@ -21,11 +21,11 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "require-dev": { - "symfony/event-dispatcher": "^4.3|^5.0" + "symfony/event-dispatcher": "^4.3|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Clickatell\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/composer.json b/src/Symfony/Component/Notifier/Bridge/Discord/composer.json index 1e4d1254a8560..1f4f135a6ac5a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Discord/composer.json @@ -17,12 +17,12 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3", + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0", "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { - "symfony/event-dispatcher": "^4.3|^5.0" + "symfony/event-dispatcher": "^4.3|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Discord\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json index 6358037b60394..1216c84409f51 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Esendex\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json index 6ce4f4949a802..a8689baf92f9b 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3", + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0", "symfony/event-dispatcher-contracts": "^2", - "symfony/mailer": "^5.2" + "symfony/mailer": "^5.2|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\FakeChat\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json index b47e06e578d14..60c19c0961173 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3", + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0", "symfony/event-dispatcher-contracts": "^2", - "symfony/mailer": "^5.2" + "symfony/mailer": "^5.2|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\FakeSms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json b/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json index 782c5239be47b..bfeaccf89d51f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Firebase\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json b/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json index 36d7277c44f80..6829441a8786b 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json @@ -18,8 +18,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.1", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.1|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\FreeMobile\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json b/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json index d7bfaf53c3973..b1f17321962a1 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\GatewayApi\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json index 95c67862fa3fc..9748b258c5008 100644 --- a/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.2.5", "ext-json": "*", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Gitter\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json b/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json index cb24cfc52fd6a..3aced0d515ef3 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\GoogleChat\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json b/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json index 00d7e4386b7ed..2394046e460d6 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Infobip\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json b/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json index bcc6f74e43153..89934208e95b1 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Iqsms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json b/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json index 2f4ee8cee01a2..e1f60f931eb30 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\LightSms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json b/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json index 36e10ccf5699b..9228787556685 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\LinkedIn\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json b/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json index 9f94864b3bc12..e03adbb17b4a9 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Mattermost\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json index 4cc5526b377e1..59cc5c786ad5a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json @@ -19,7 +19,7 @@ "php": ">=7.2.5", "ext-json": "*", "symfony/mercure": "^0.5.2", - "symfony/notifier": "^5.3", + "symfony/notifier": "^5.3|^6.0", "symfony/service-contracts": "^1.10|^2" }, "autoload": { diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json b/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json index 269084f5d0f26..28f8522e21a11 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\MessageBird\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json index 79de23bc26507..79a8cfad9affa 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\MicrosoftTeams\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json index 93217a5b9828f..ca351d75a1ba1 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.2.5", "ext-json": "*", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Mobyt\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/composer.json b/src/Symfony/Component/Notifier/Bridge/Nexmo/composer.json index 74cf98d8cc1fb..9a5e68fd550ce 100644 --- a/src/Symfony/Component/Notifier/Bridge/Nexmo/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Nexmo/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Nexmo\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json b/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json index 4bd901677399d..e9a8add64565d 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Octopush\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json b/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json index 7030cb30143d0..80958c16822d1 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\OvhCloud\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json b/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json index 823f51d02cef6..91bc3a809e4a8 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\RocketChat\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json b/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json index 68e44aa84be8f..cb8ec2bd74e7a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.2.5", "ext-json": "*", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Sendinblue\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json index 6ff9d8e282ea0..d5dc5831aa175 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.2.5", "ext-json": "*", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Sinch\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json index ae69796774d9b..2192104bdecd8 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json @@ -18,11 +18,11 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "require-dev": { - "symfony/event-dispatcher": "^4.3|^5.0" + "symfony/event-dispatcher": "^4.3|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Slack\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json index 3a6da1fa23a5b..d4441d63ba0e0 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.4|^5.2", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.4|^5.2|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\SmsBiuras\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json index 28564eaa91c96..b417458459742 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Smsapi\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json b/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json index 32ec5f8b01283..b2bfdf7f87c8d 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.1", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.1|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\SpotHit\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json b/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json index ffca90186448a..415b97c4e02fc 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "require-dev": { - "symfony/event-dispatcher": "^4.3|^5.0" + "symfony/event-dispatcher": "^4.3|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Telegram\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json index 04bc30f7306ca..8716e061ca359 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Twilio\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json b/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json index b96a349288591..9a89347ea709e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^4.3|^5.0", - "symfony/notifier": "^5.3" + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/notifier": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Zulip\\": "" }, diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json index 4ca8d67ea9c08..b69fe64a075af 100644 --- a/src/Symfony/Component/Notifier/composer.json +++ b/src/Symfony/Component/Notifier/composer.json @@ -23,7 +23,7 @@ "require-dev": { "symfony/event-dispatcher-contracts": "^2", "symfony/http-client-contracts": "^2", - "symfony/messenger": "^4.4 || ^5.0" + "symfony/messenger": "^4.4 || ^5.0|^6.0" }, "conflict": { "symfony/http-kernel": "<4.4", diff --git a/src/Symfony/Component/PasswordHasher/composer.json b/src/Symfony/Component/PasswordHasher/composer.json index 009895076017b..fb41798e1da2b 100644 --- a/src/Symfony/Component/PasswordHasher/composer.json +++ b/src/Symfony/Component/PasswordHasher/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/security-core": "^5.3", + "symfony/security-core": "^5.3|^6.0", "symfony/console": "^5" }, "conflict": { diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json index 13291bd03ffce..5f6c30e3a0462 100644 --- a/src/Symfony/Component/PropertyAccess/composer.json +++ b/src/Symfony/Component/PropertyAccess/composer.json @@ -19,10 +19,10 @@ "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php80": "^1.15", - "symfony/property-info": "^5.2" + "symfony/property-info": "^5.2|^6.0" }, "require-dev": { - "symfony/cache": "^4.4|^5.0" + "symfony/cache": "^4.4|^5.0|^6.0" }, "suggest": { "psr/cache-implementation": "To cache access methods." diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json index 04fff7f665bfd..d1c46862cdda5 100644 --- a/src/Symfony/Component/PropertyInfo/composer.json +++ b/src/Symfony/Component/PropertyInfo/composer.json @@ -26,12 +26,12 @@ "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php80": "^1.15", - "symfony/string": "^5.1" + "symfony/string": "^5.1|^6.0" }, "require-dev": { - "symfony/serializer": "^4.4|^5.0", - "symfony/cache": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", + "symfony/serializer": "^4.4|^5.0|^6.0", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "doctrine/annotations": "^1.10.4" }, diff --git a/src/Symfony/Component/RateLimiter/composer.json b/src/Symfony/Component/RateLimiter/composer.json index 22933556f1543..c217ded3e8821 100644 --- a/src/Symfony/Component/RateLimiter/composer.json +++ b/src/Symfony/Component/RateLimiter/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/lock": "^5.2", - "symfony/options-resolver": "^5.1" + "symfony/lock": "^5.2|^6.0", + "symfony/options-resolver": "^5.1|^6.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0" diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 936085e4e96af..47b61fdc3ba75 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -21,11 +21,11 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/config": "^5.3", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", + "symfony/config": "^5.3|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", "doctrine/annotations": "^1.12", "psr/log": "~1.0" }, diff --git a/src/Symfony/Component/Runtime/composer.json b/src/Symfony/Component/Runtime/composer.json index 668130cdbc2e2..b5a190a000bfb 100644 --- a/src/Symfony/Component/Runtime/composer.json +++ b/src/Symfony/Component/Runtime/composer.json @@ -22,7 +22,7 @@ "require-dev": { "composer/composer": "^1.0.2|^2.0", "symfony/console": "^4.4|^5", - "symfony/dotenv": "^5.1", + "symfony/dotenv": "^5.1|^6.0", "symfony/http-foundation": "^4.4|^5", "symfony/http-kernel": "^4.4|^5" }, diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index d129ffee554d4..6f890b3c362ff 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -21,18 +21,18 @@ "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1.6|^2", "symfony/deprecation-contracts": "^2.1", - "symfony/password-hasher": "^5.3" + "symfony/password-hasher": "^5.3|^6.0" }, "require-dev": { "psr/container": "^1.0|^2.0", "psr/cache": "^1.0|^2.0|^3.0", - "symfony/cache": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/http-foundation": "^5.3", - "symfony/ldap": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/validator": "^5.2", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/ldap": "^4.4|^5.0|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/validator": "^5.2|^6.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json index 5693034cffaa7..5660c3c8ffafd 100644 --- a/src/Symfony/Component/Security/Csrf/composer.json +++ b/src/Symfony/Component/Security/Csrf/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=7.2.5", - "symfony/security-core": "^4.4|^5.0" + "symfony/security-core": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/http-foundation": "^5.3" + "symfony/http-foundation": "^5.3|^6.0" }, "conflict": { "symfony/http-foundation": "<5.3" diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json index ad10ef9f70de1..87580853fa177 100644 --- a/src/Symfony/Component/Security/Guard/composer.json +++ b/src/Symfony/Component/Security/Guard/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=7.2.5", - "symfony/security-core": "^5.0", - "symfony/security-http": "^5.3", + "symfony/security-core": "^5.0|^6.0", + "symfony/security-http": "^5.3|^6.0", "symfony/polyfill-php80": "^1.15" }, "require-dev": { diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index 960944b84f401..d6a58890bd075 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -18,19 +18,19 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/security-core": "^5.3", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^5.3", + "symfony/security-core": "^5.3|^6.0", + "symfony/http-foundation": "^5.3|^6.0", + "symfony/http-kernel": "^5.3|^6.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.15", - "symfony/property-access": "^4.4|^5.0" + "symfony/property-access": "^4.4|^5.0|^6.0" }, "require-dev": { - "symfony/cache": "^4.4|^5.0", - "symfony/rate-limiter": "^5.2", - "symfony/routing": "^4.4|^5.0", - "symfony/security-csrf": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0", + "symfony/routing": "^4.4|^5.0|^6.0", + "symfony/security-csrf": "^4.4|^5.0|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 60a0567f920a0..5e736d1c337b0 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -24,22 +24,22 @@ "require-dev": { "doctrine/annotations": "^1.12", "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", - "symfony/cache": "^4.4|^5.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/error-handler": "^4.4|^5.0", - "symfony/filesystem": "^4.4|^5.0", - "symfony/form": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/property-access": "^4.4.9|^5.0.9", - "symfony/property-info": "^5.3", - "symfony/uid": "^5.1", - "symfony/validator": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", - "symfony/var-exporter": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0" + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/form": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4.9|^5.0.9|^6.0", + "symfony/property-info": "^5.3|^6.0", + "symfony/uid": "^5.1|^6.0", + "symfony/validator": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0", + "symfony/var-exporter": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0" }, "conflict": { "doctrine/annotations": "<1.12", diff --git a/src/Symfony/Component/String/composer.json b/src/Symfony/Component/String/composer.json index bfb03cd363b54..6dc1c46fe31b5 100644 --- a/src/Symfony/Component/String/composer.json +++ b/src/Symfony/Component/String/composer.json @@ -24,10 +24,10 @@ "symfony/polyfill-php80": "~1.15" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\String\\": "" }, diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json b/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json index 87cb6a339c01a..7523bc7d4dfef 100644 --- a/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json +++ b/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json @@ -21,9 +21,9 @@ ], "require": { "php": ">=7.2.5", - "symfony/config": "^5.3", - "symfony/http-client": "^5.3", - "symfony/translation": "^5.3" + "symfony/config": "^5.3|^6.0", + "symfony/http-client": "^5.3|^6.0", + "symfony/translation": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\Bridge\\Crowdin\\": "" }, diff --git a/src/Symfony/Component/Translation/Bridge/Loco/composer.json b/src/Symfony/Component/Translation/Bridge/Loco/composer.json index 550a2f5b6de74..49b9c4193987b 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/composer.json +++ b/src/Symfony/Component/Translation/Bridge/Loco/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=7.2.5", - "symfony/http-client": "^5.3", - "symfony/config": "^5.3", - "symfony/translation": "^5.3" + "symfony/http-client": "^5.3|^6.0", + "symfony/config": "^5.3|^6.0", + "symfony/translation": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\Bridge\\Loco\\": "" }, diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/composer.json b/src/Symfony/Component/Translation/Bridge/Lokalise/composer.json index 4e0f1c6c94895..13423b89d77ea 100644 --- a/src/Symfony/Component/Translation/Bridge/Lokalise/composer.json +++ b/src/Symfony/Component/Translation/Bridge/Lokalise/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=7.2.5", - "symfony/config": "^5.3", - "symfony/http-client": "^5.3", - "symfony/translation": "^5.3" + "symfony/config": "^5.3|^6.0", + "symfony/http-client": "^5.3|^6.0", + "symfony/translation": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\Bridge\\Lokalise\\": "" }, diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/composer.json b/src/Symfony/Component/Translation/Bridge/PoEditor/composer.json index 1ddc1d87cd8ef..afdaf7bb135b1 100644 --- a/src/Symfony/Component/Translation/Bridge/PoEditor/composer.json +++ b/src/Symfony/Component/Translation/Bridge/PoEditor/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=7.2.5", - "symfony/config": "^5.3", - "symfony/http-client": "^5.3", - "symfony/translation": "^5.3" + "symfony/config": "^5.3|^6.0", + "symfony/http-client": "^5.3|^6.0", + "symfony/translation": "^5.3|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\Bridge\\PoEditor\\": "" }, diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 01c05bd7d8f36..fcd832be0fc4f 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -23,15 +23,15 @@ "symfony/translation-contracts": "^2.3" }, "require-dev": { - "symfony/config": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/dependency-injection": "^5.0", - "symfony/http-kernel": "^5.0", - "symfony/intl": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.0|^6.0", + "symfony/http-kernel": "^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", "symfony/polyfill-intl-icu": "^1.21", "symfony/service-contracts": "^1.1.2|^2", - "symfony/yaml": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Uid/composer.json b/src/Symfony/Component/Uid/composer.json index 0eae40ea68cbb..65e8b8729abe2 100644 --- a/src/Symfony/Component/Uid/composer.json +++ b/src/Symfony/Component/Uid/composer.json @@ -24,7 +24,7 @@ "symfony/polyfill-uuid": "^1.15" }, "require-dev": { - "symfony/console": "^4.4|^5.0" + "symfony/console": "^4.4|^5.0|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Uid\\": "" }, diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 119e90b03f6aa..18f521fdb864f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -25,21 +25,21 @@ "symfony/translation-contracts": "^1.1|^2" }, "require-dev": { - "symfony/console": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/intl": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/expression-language": "^5.1", - "symfony/cache": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.0", - "symfony/property-info": "^5.3", - "symfony/translation": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^5.1|^6.0", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/property-info": "^5.3|^6.0", + "symfony/translation": "^4.4|^5.0|^6.0", "doctrine/annotations": "^1.10.4", "doctrine/cache": "^1.0|^2.0", "egulias/email-validator": "^2.1.10|^3" diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json index 16da4888fc984..a82179b216315 100644 --- a/src/Symfony/Component/VarDumper/composer.json +++ b/src/Symfony/Component/VarDumper/composer.json @@ -22,8 +22,8 @@ }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", "twig/twig": "^2.13|^3.0.4" }, "conflict": { diff --git a/src/Symfony/Component/VarExporter/composer.json b/src/Symfony/Component/VarExporter/composer.json index ebd1947f43fc2..51334185b7477 100644 --- a/src/Symfony/Component/VarExporter/composer.json +++ b/src/Symfony/Component/VarExporter/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-php80": "^1.15" }, "require-dev": { - "symfony/var-dumper": "^4.4.9|^5.0.9" + "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0" }, "autoload": { "psr-4": { "Symfony\\Component\\VarExporter\\": "" }, diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json index afac9a0d694e3..22d282382a0aa 100644 --- a/src/Symfony/Component/WebLink/composer.json +++ b/src/Symfony/Component/WebLink/composer.json @@ -26,7 +26,7 @@ "symfony/http-kernel": "" }, "require-dev": { - "symfony/http-kernel": "^5.3" + "symfony/http-kernel": "^5.3|^6.0" }, "conflict": { "symfony/http-kernel": "<5.3" diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json index 8dd026d4664c4..361eae1ea494b 100644 --- a/src/Symfony/Component/Workflow/composer.json +++ b/src/Symfony/Component/Workflow/composer.json @@ -25,11 +25,11 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/security-core": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0" + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/security-core": "^4.4|^5.0|^6.0", + "symfony/validator": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/event-dispatcher": "<4.4" diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 4aca5c85b3852..e5c6467291794 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -21,7 +21,7 @@ "symfony/polyfill-ctype": "~1.8" }, "require-dev": { - "symfony/console": "^4.4|^5.0" + "symfony/console": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/console": "<4.4" From 20bf651cb5c9f889d380649fe33f4092b8b0244c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 20 May 2021 15:00:29 +0200 Subject: [PATCH 07/16] [Runtime] allow "|^6.0" deps --- src/Symfony/Component/Runtime/composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Runtime/composer.json b/src/Symfony/Component/Runtime/composer.json index b5a190a000bfb..021c8877fcedf 100644 --- a/src/Symfony/Component/Runtime/composer.json +++ b/src/Symfony/Component/Runtime/composer.json @@ -21,10 +21,10 @@ }, "require-dev": { "composer/composer": "^1.0.2|^2.0", - "symfony/console": "^4.4|^5", + "symfony/console": "^4.4|^5.0|^6.0", "symfony/dotenv": "^5.1|^6.0", - "symfony/http-foundation": "^4.4|^5", - "symfony/http-kernel": "^4.4|^5" + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0" }, "conflict": { "symfony/dotenv": "<5.1" From 6d3e90d1ea7eb060bf31f8ca670d3fbec61054ed Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 12 May 2021 16:43:49 +0200 Subject: [PATCH 08/16] [FrameworkBundle] Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead --- UPGRADE-5.4.md | 7 +++++++ UPGRADE-6.0.md | 1 + src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md | 1 + .../Bundle/FrameworkBundle/Resources/config/cache.php | 1 + 4 files changed, 10 insertions(+) create mode 100644 UPGRADE-5.4.md diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md new file mode 100644 index 0000000000000..c5f3095ffcf21 --- /dev/null +++ b/UPGRADE-5.4.md @@ -0,0 +1,7 @@ +UPGRADE FROM 5.3 to 5.4 +======================= + +FrameworkBundle +--------------- + + * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md index 9ec7d84f308d0..3287fb785633d 100644 --- a/UPGRADE-6.0.md +++ b/UPGRADE-6.0.md @@ -89,6 +89,7 @@ FrameworkBundle * Registered workflow services are now private * Remove option `--xliff-version` of the `translation:update` command, use e.g. `--output-format=xlf20` instead * Remove option `--output-format` of the `translation:update` command, use e.g. `--output-format=xlf20` instead + * Remove the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead HttpFoundation -------------- diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 435fa83445071..49ebf8c87dd6d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG --- * Add autowiring alias for `HttpCache\StoreInterface` + * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead 5.3 --- diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php index b44f3b9fb315d..f7dc4bd123579 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php @@ -238,6 +238,7 @@ ->alias(CacheItemPoolInterface::class, 'cache.app') ->alias(AdapterInterface::class, 'cache.app') + ->deprecate('symfony/framework-bundle', '5.4', 'The "%alias_id%" alias is deprecated, use "%s" instead.', CacheItemPoolInterface::class) ->alias(CacheInterface::class, 'cache.app') From 0458384ab566f0a17d716e4529ab03ba5398607d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Thu, 20 May 2021 20:00:38 +0200 Subject: [PATCH 09/16] Fix compatibility with Symfony6 --- .../Resources/config/session.php | 1 + .../FrameworkBundle/Resources/config/test.php | 1 + .../FrameworkExtensionTest.php | 8 +++---- .../EventListener/AbstractSessionListener.php | 1 + .../EventListener/SessionListener.php | 10 +++++--- .../EventListener/TestSessionListener.php | 10 +++++--- .../EventListener/SessionListenerTest.php | 23 +++++++++++++++++++ 7 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php index 9dbaff5c829e1..65a1b364dce12 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php @@ -146,6 +146,7 @@ ->set('session_listener', SessionListener::class) ->args([ service_locator([ + 'session_factory' => service('session.factory')->ignoreOnInvalid(), 'session' => service('.session.do-not-use')->ignoreOnInvalid(), 'initialized_session' => service('.session.do-not-use')->ignoreOnUninitialized(), 'logger' => service('logger')->ignoreOnInvalid(), diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php index 61e4052521329..29f3fa815c836 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php @@ -38,6 +38,7 @@ ->set('test.session.listener', TestSessionListener::class) ->args([ service_locator([ + 'session_factory' => service('session.factory')->ignoreOnInvalid(), 'session' => service('.session.do-not-use')->ignoreOnInvalid(), ]), ]) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 02f8748c3d996..e7619ef2019be 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -581,7 +581,7 @@ public function testNullSessionHandler() $this->assertNull($container->getDefinition('session.storage.factory.php_bridge')->getArgument(0)); $this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler')); - $expected = ['session', 'initialized_session', 'logger', 'session_collector']; + $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector']; $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues())); $this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3)); } @@ -600,7 +600,7 @@ public function testNullSessionHandlerLegacy() $this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0)); $this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler')); - $expected = ['session', 'initialized_session', 'logger', 'session_collector']; + $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector']; $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues())); $this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3)); } @@ -1618,7 +1618,7 @@ public function testSessionCookieSecureAuto() { $container = $this->createContainerFromFile('session_cookie_secure_auto'); - $expected = ['session', 'initialized_session', 'logger', 'session_collector']; + $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector']; $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues())); } @@ -1631,7 +1631,7 @@ public function testSessionCookieSecureAutoLegacy() $container = $this->createContainerFromFile('session_cookie_secure_auto_legacy'); - $expected = ['session', 'initialized_session', 'logger', 'session_collector', 'session_storage', 'request_stack']; + $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'session_storage', 'request_stack']; $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues())); } diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php index eae5fb6bab225..d76f29b5bc683 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php @@ -58,6 +58,7 @@ public function onKernelRequest(RequestEvent $event) $request = $event->getRequest(); if (!$request->hasSession()) { + // This variable prevents calling `$this->getSession()` twice in case the Request (and the below factory) is cloned $sess = null; $request->setSessionFactory(function () use (&$sess) { return $sess ?? $sess = $this->getSession(); }); } diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php index f2b950cef2e2e..e396aa5035037 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php @@ -53,10 +53,14 @@ public function onKernelRequest(RequestEvent $event) protected function getSession(): ?SessionInterface { - if (!$this->container->has('session')) { - return null; + if ($this->container->has('session')) { + return $this->container->get('session'); } - return $this->container->get('session'); + if ($this->container->has('session_factory')) { + return $this->container->get('session_factory')->createSession(); + } + + return null; } } diff --git a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php index ff8b4aaa614d6..6d4b36ace352c 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php @@ -33,10 +33,14 @@ public function __construct(ContainerInterface $container, array $sessionOptions protected function getSession(): ?SessionInterface { - if (!$this->container->has('session')) { - return null; + if ($this->container->has('session')) { + return $this->container->get('session'); } - return $this->container->get('session'); + if ($this->container->has('session_factory')) { + return $this->container->get('session_factory')->createSession(); + } + + return null; } } diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index 336a77c8f6a82..aa0229a9ebfa9 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -19,6 +19,7 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Session\SessionFactory; use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector; use Symfony\Component\HttpKernel\Event\FinishRequestEvent; @@ -71,6 +72,28 @@ public function testSessionIsSet() $this->assertSame($session, $request->getSession()); } + public function testSessionUsesFactory() + { + $session = $this->createMock(Session::class); + $sessionFactory = $this->createMock(SessionFactory::class); + $sessionFactory->expects($this->once())->method('createSession')->willReturn($session); + + $container = new Container(); + $container->set('session_factory', $sessionFactory); + + $request = new Request(); + $listener = new SessionListener($container); + + $event = $this->createMock(RequestEvent::class); + $event->expects($this->exactly(2))->method('isMainRequest')->willReturn(true); + $event->expects($this->once())->method('getRequest')->willReturn($request); + + $listener->onKernelRequest($event); + + $this->assertTrue($request->hasSession()); + $this->assertSame($session, $request->getSession()); + } + public function testResponseIsPrivateIfSessionStarted() { $session = $this->createMock(Session::class); From 2ba71b0428fc8568712dcf8601742234d2fd4be8 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 27 May 2021 15:09:16 +0200 Subject: [PATCH 10/16] [travis] test with v6 on deps=high --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e69266ca4222..311d13040a17f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ env: matrix: include: - php: 7.2 - env: php_extra="7.3 8.0" - - php: 7.4 + env: php_extra="7.3 7.4" + - php: 8.0 env: deps=high - php: 8.0 env: deps=low From b56606e1fd4433ea3390553784d1943c63dba718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Sat, 29 May 2021 13:17:28 +0200 Subject: [PATCH 11/16] Provide migration path for TestSessionListener --- UPGRADE-5.4.md | 5 +++++ .../Bundle/FrameworkBundle/Resources/config/test.php | 1 - src/Symfony/Component/HttpKernel/CHANGELOG.md | 5 +++++ .../EventListener/AbstractTestSessionListener.php | 8 ++++++-- .../HttpKernel/EventListener/TestSessionListener.php | 9 +++++---- .../Tests/EventListener/TestSessionListenerTest.php | 3 ++- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md index c5f3095ffcf21..79a26bd52ca84 100644 --- a/UPGRADE-5.4.md +++ b/UPGRADE-5.4.md @@ -5,3 +5,8 @@ FrameworkBundle --------------- * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead + +HttpKernel +---------- + + * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php index 29f3fa815c836..61e4052521329 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.php @@ -38,7 +38,6 @@ ->set('test.session.listener', TestSessionListener::class) ->args([ service_locator([ - 'session_factory' => service('session.factory')->ignoreOnInvalid(), 'session' => service('.session.do-not-use')->ignoreOnInvalid(), ]), ]) diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index 1a5f67ba1db83..ed36ac8cbfbaa 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +5.4 +--- + + * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead + 5.3 --- diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php index 0c88187d1e931..8fa667ced3c8f 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php @@ -46,7 +46,9 @@ public function onKernelRequest(RequestEvent $event) } // bootstrap the session - if (!$session = $this->getSession()) { + if ($event->getRequest()->hasSession()) { + $session = $event->getRequest()->getSession(); + } elseif (!$session = $this->getSession()) { return; } @@ -100,7 +102,7 @@ public function onKernelResponse(ResponseEvent $event) public static function getSubscribedEvents(): array { return [ - KernelEvents::REQUEST => ['onKernelRequest', 192], + KernelEvents::REQUEST => ['onKernelRequest', 127], // AFTER SessionListener KernelEvents::RESPONSE => ['onKernelResponse', -128], ]; } @@ -108,6 +110,8 @@ public static function getSubscribedEvents(): array /** * Gets the session object. * + * @deprecated since Symfony 5.4, will be removed in 6.0. + * * @return SessionInterface|null A SessionInterface instance or null if no session is available */ abstract protected function getSession(); diff --git a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php index 6d4b36ace352c..ceac3dde8102b 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php @@ -31,16 +31,17 @@ public function __construct(ContainerInterface $container, array $sessionOptions parent::__construct($sessionOptions); } + /** + * @deprecated since Symfony 5.4, will be removed in 6.0. + */ protected function getSession(): ?SessionInterface { + trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated and will be removed in 6.0, inject a session in the request instead.', __METHOD__); + if ($this->container->has('session')) { return $this->container->get('session'); } - if ($this->container->has('session_factory')) { - return $this->container->get('session_factory')->createSession(); - } - return null; } } diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php index 016f7901c667a..abb13bcb10408 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php @@ -19,7 +19,6 @@ use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\EventListener\AbstractTestSessionListener; -use Symfony\Component\HttpKernel\EventListener\SessionListener; use Symfony\Component\HttpKernel\EventListener\TestSessionListener; use Symfony\Component\HttpKernel\HttpKernelInterface; @@ -99,6 +98,7 @@ public function testEmptySessionWithNewSessionIdDoesSendCookie() $kernel = $this->createMock(HttpKernelInterface::class); $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']); + $request->setSession($this->getSession()); $event = new RequestEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST); $this->listener->onKernelRequest($event); @@ -118,6 +118,7 @@ public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie( $kernel = $this->createMock(HttpKernelInterface::class); $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']); + $request->setSession($this->getSession()); $event = new RequestEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST); $this->listener->onKernelRequest($event); From b7e91943b6b685b32945ab0ef968d532fc181009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Tue, 1 Jun 2021 10:53:00 +0200 Subject: [PATCH 12/16] Fix sessionListener when factory is injected without session --- .../Component/HttpKernel/EventListener/SessionListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php index e396aa5035037..f41939bade11a 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php @@ -38,7 +38,7 @@ public function onKernelRequest(RequestEvent $event) { parent::onKernelRequest($event); - if (!$event->isMainRequest() || !$this->container->has('session')) { + if (!$event->isMainRequest() || (!$this->container->has('session') && !$this->container->has('session_factory'))) { return; } From f4da7e40e779a6bc8d3960af9689c0108f088a1f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 28 May 2021 10:40:58 +0200 Subject: [PATCH 13/16] [Yaml] Leverage array_is_list() --- src/Symfony/Component/Yaml/Inline.php | 14 +------------- src/Symfony/Component/Yaml/composer.json | 3 ++- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 3a6fe03e8dee6..f42a677dc2d5c 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -207,19 +207,7 @@ public static function dump($value, int $flags = 0): string */ public static function isHash($value): bool { - if ($value instanceof \stdClass || $value instanceof \ArrayObject) { - return true; - } - - $expectedKey = 0; - - foreach ($value as $key => $val) { - if ($key !== $expectedKey++) { - return true; - } - } - - return false; + return !\is_array($value) || !array_is_list($value); } /** diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index e5c6467291794..215d91bd3eae9 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -18,7 +18,8 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-ctype": "~1.8" + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-php81": "^1.22" }, "require-dev": { "symfony/console": "^4.4|^5.0|^6.0" From 06b13c35e7d9b863b8947b749fb8b676adbe2f59 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 3 Jun 2021 17:11:29 +0200 Subject: [PATCH 14/16] [FrameworkBundle] Deprecate the public `profiler` service to private --- UPGRADE-5.4.md | 1 + UPGRADE-6.0.md | 2 +- .../Bundle/FrameworkBundle/CHANGELOG.md | 1 + .../Bundle/FrameworkBundle/KernelBrowser.php | 20 ++++++++++++------- .../Resources/config/profiling.php | 1 + 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md index 79a26bd52ca84..9c81e39a2f9cd 100644 --- a/UPGRADE-5.4.md +++ b/UPGRADE-5.4.md @@ -5,6 +5,7 @@ FrameworkBundle --------------- * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead + * Deprecate the public `profiler` service to private HttpKernel ---------- diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md index 3287fb785633d..30f6f1fa5861f 100644 --- a/UPGRADE-6.0.md +++ b/UPGRADE-6.0.md @@ -82,7 +82,7 @@ FrameworkBundle * `MicroKernelTrait::configureRoutes()` is now always called with a `RoutingConfigurator` * The "framework.router.utf8" configuration option defaults to `true` * Removed `session.attribute_bag` service and `session.flash_bag` service. - * The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`, + * The `form.factory`, `form.type.file`, `profiler`, `translator`, `security.csrf.token_manager`, `serializer`, `cache_clearer`, `filesystem` and `validator` services are now private. * Removed the `lock.RESOURCE_NAME` and `lock.RESOURCE_NAME.store` services and the `lock`, `LockInterface`, `lock.store` and `PersistingStoreInterface` aliases, use `lock.RESOURCE_NAME.factory`, `lock.factory` or `LockFactory` instead. * Remove the `KernelTestCase::$container` property, use `KernelTestCase::getContainer()` instead diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 49ebf8c87dd6d..ee3a172397652 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -6,6 +6,7 @@ CHANGELOG * Add autowiring alias for `HttpCache\StoreInterface` * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead + * Deprecate the public `profiler` service to private 5.3 --- diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php index 23f698d4bca28..c7c32f8e18858 100644 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php +++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php @@ -49,7 +49,9 @@ public function __construct(KernelInterface $kernel, array $server = [], History */ public function getContainer() { - return $this->kernel->getContainer(); + $container = $this->kernel->getContainer(); + + return $container->has('test.service_container') ? $container->get('test.service_container') : $container; } /** @@ -69,11 +71,11 @@ public function getKernel() */ public function getProfile() { - if (null === $this->response || !$this->kernel->getContainer()->has('profiler')) { + if (null === $this->response || !$this->getContainer()->has('profiler')) { return false; } - return $this->kernel->getContainer()->get('profiler')->loadProfileFromResponse($this->response); + return $this->getContainer()->get('profiler')->loadProfileFromResponse($this->response); } /** @@ -83,7 +85,7 @@ public function getProfile() */ public function enableProfiler() { - if ($this->kernel->getContainer()->has('profiler')) { + if ($this->getContainer()->has('profiler')) { $this->profiler = true; } } @@ -123,7 +125,7 @@ public function loginUser($user, string $firewallContext = 'main'): self $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext); $token->setAuthenticated(true); - $container = $this->kernel->getContainer()->get('test.service_container'); + $container = $this->getContainer(); $container->get('security.untracked_token_storage')->setToken($token); if (!$container->has('session') && !$container->has('session_factory')) { @@ -161,7 +163,7 @@ protected function doRequest($request) $this->profiler = false; $this->kernel->boot(); - $this->kernel->getContainer()->get('profiler')->enable(); + $this->getContainer()->get('profiler')->enable(); } return parent::doRequest($request); @@ -220,7 +222,11 @@ protected function getScript($request) $profilerCode = ''; if ($this->profiler) { - $profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();'; + $profilerCode = <<<'EOF' +$container = $kernel->getContainer(); +$container = $container->has('test.service_container') ? $container->get('test.service_container') : $container; +$container->get('profiler')->enable(); +EOF; } $code = <<public() ->args([service('profiler.storage'), service('logger')->nullOnInvalid()]) ->tag('monolog.logger', ['channel' => 'profiler']) + ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.4']) ->set('profiler.storage', FileProfilerStorage::class) ->args([param('profiler.storage.dsn')]) From 0dde2cce14c89121bf9115632bc43b02293e9b66 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 4 Jun 2021 10:32:36 +0200 Subject: [PATCH 15/16] [VarDumper] Add casters for Symfony UUIDs and ULIDs --- src/Symfony/Component/VarDumper/CHANGELOG.md | 5 ++ .../VarDumper/Caster/SymfonyCaster.php | 28 +++++++ .../VarDumper/Cloner/AbstractCloner.php | 2 + .../Tests/Caster/SymfonyCasterTest.php | 83 +++++++++++++++++++ src/Symfony/Component/VarDumper/composer.json | 1 + 5 files changed, 119 insertions(+) create mode 100644 src/Symfony/Component/VarDumper/Tests/Caster/SymfonyCasterTest.php diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md index f3956e6ae1b29..d38a43cf1eafc 100644 --- a/src/Symfony/Component/VarDumper/CHANGELOG.md +++ b/src/Symfony/Component/VarDumper/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +5.4 +--- + + * Add casters for Symfony's UUIDs and ULIDs + 5.2.0 ----- diff --git a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php index b7e1dd43e637a..08428b9274100 100644 --- a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php @@ -12,6 +12,8 @@ namespace Symfony\Component\VarDumper\Caster; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Uid\Ulid; +use Symfony\Component\Uid\Uuid; use Symfony\Component\VarDumper\Cloner\Stub; /** @@ -66,4 +68,30 @@ public static function castHttpClientResponse($response, array $a, Stub $stub, b return $a; } + + public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested) + { + $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $uuid->toBase58(); + $a[Caster::PREFIX_VIRTUAL.'toBase32'] = $uuid->toBase32(); + + // symfony/uid >= 5.3 + if (method_exists($uuid, 'getDateTime')) { + $a[Caster::PREFIX_VIRTUAL.'time'] = $uuid->getDateTime()->format('Y-m-d H:i:s.u \U\T\C'); + } + + return $a; + } + + public static function castUlid(Ulid $ulid, array $a, Stub $stub, bool $isNested) + { + $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $ulid->toBase58(); + $a[Caster::PREFIX_VIRTUAL.'toRfc4122'] = $ulid->toRfc4122(); + + // symfony/uid >= 5.3 + if (method_exists($ulid, 'getDateTime')) { + $a[Caster::PREFIX_VIRTUAL.'time'] = $ulid->getDateTime()->format('Y-m-d H:i:s.v \U\T\C'); + } + + return $a; + } } diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php index 739e069934550..962ca400101cc 100644 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php @@ -86,6 +86,8 @@ abstract class AbstractCloner implements ClonerInterface 'Symfony\Component\HttpClient\Response\CurlResponse' => ['Symfony\Component\VarDumper\Caster\SymfonyCaster', 'castHttpClientResponse'], 'Symfony\Component\HttpClient\Response\NativeResponse' => ['Symfony\Component\VarDumper\Caster\SymfonyCaster', 'castHttpClientResponse'], 'Symfony\Component\HttpFoundation\Request' => ['Symfony\Component\VarDumper\Caster\SymfonyCaster', 'castRequest'], + 'Symfony\Component\Uid\Ulid' => ['Symfony\Component\VarDumper\Caster\SymfonyCaster', 'castUlid'], + 'Symfony\Component\Uid\Uuid' => ['Symfony\Component\VarDumper\Caster\SymfonyCaster', 'castUuid'], 'Symfony\Component\VarDumper\Exception\ThrowingCasterException' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castThrowingCasterException'], 'Symfony\Component\VarDumper\Caster\TraceStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castTraceStub'], 'Symfony\Component\VarDumper\Caster\FrameStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castFrameStub'], diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SymfonyCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SymfonyCasterTest.php new file mode 100644 index 0000000000000..fff40dfb58251 --- /dev/null +++ b/src/Symfony/Component/VarDumper/Tests/Caster/SymfonyCasterTest.php @@ -0,0 +1,83 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\VarDumper\Tests\Caster; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Uid\Ulid; +use Symfony\Component\Uid\UuidV4; +use Symfony\Component\Uid\UuidV6; +use Symfony\Component\VarDumper\Test\VarDumperTestTrait; + +final class SymfonyCasterTest extends TestCase +{ + use VarDumperTestTrait; + + public function testCastUuid() + { + $uuid = new UuidV4('83a9db35-3c8c-4040-b3c1-02eccc00b419'); + $expectedDump = <<assertDumpEquals($expectedDump, $uuid); + + $uuid = new UuidV6('1ebc50e9-8a23-6704-ad6f-59afd5cda7e5'); + if (method_exists($uuid, 'getDateTime')) { + $expectedDump = <<assertDumpEquals($expectedDump, $uuid); + } + + public function testCastUlid() + { + $ulid = new Ulid('01F7B252SZQGTSQGYSGACASAW6'); + if (method_exists($ulid, 'getDateTime')) { + $expectedDump = <<assertDumpEquals($expectedDump, $ulid); + } +} diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json index a82179b216315..c1457ecee797d 100644 --- a/src/Symfony/Component/VarDumper/composer.json +++ b/src/Symfony/Component/VarDumper/composer.json @@ -24,6 +24,7 @@ "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", + "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" }, "conflict": { From 663a736d9063970507b8627f7690cff58e354713 Mon Sep 17 00:00:00 2001 From: Mathias Brodala Date: Fri, 18 Jun 2021 09:38:07 +0200 Subject: [PATCH 16/16] Avoid broken action URL in text notification mail Some mail clients make URLs clickable automatically which leads to broken URLs due to the appended ":" (colon) Fix this by moving the action text before the action URL. --- .../Resources/views/Email/zurb_2/notification/body.txt.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig index db855829703e4..c98bb08a74c03 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig @@ -8,7 +8,7 @@ {% block action %} {% if action_url %} -{{ action_url }}: {{ action_text }} +{{ action_text }}: {{ action_url }} {% endif %} {% endblock %}