symfony · mbrodala · May 12, 2021 · May 19, 2021 · May 19, 2021 · May 19, 2021
diff --git a/.travis.yml b/.travis.yml
@@ -18,16 +18,16 @@ addons:
 
 env:
     global:
-        - SYMFONY_VERSION=5.3
+        - SYMFONY_VERSION=5.4
         - MIN_PHP=7.2.5
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
         - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
 
 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

diff --git a/README.md b/README.md
@@ -17,11 +17,11 @@ Installation
 Sponsor
 -------
 
-Symfony 5.3 is [backed][27] by [JoliCode][28].
+Symfony 5.4 is [backed][27] by [Private Packagist][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.
+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!
 
@@ -87,5 +87,5 @@ Symfony development is sponsored by [SensioLabs][21], led by the
 [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/
+[28]: https://packagist.com/
 [29]: https://symfony.com/sponsor
diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md
@@ -0,0 +1,13 @@
+UPGRADE FROM 5.3 to 5.4
+=======================
+
+FrameworkBundle
+---------------
+
+ * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead
+ * Deprecate the public `profiler` service to private
+
+HttpKernel
+----------
+
+ * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -82,13 +82,14 @@ 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
  * 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/composer.json b/composer.json
@@ -142,7 +142,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/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",

diff --git 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
@@ -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
@@ -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
@@ -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/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 %}
 

diff --git 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
@@ -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/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+5.4
+---
+
+ * 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/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')
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php
@@ -21,6 +21,7 @@
             ->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')])

diff --git 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([

diff --git 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/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()));
     }