Merge branch '6.1' into 6.2

* 6.1:
  Move subguides into main session article
  Minor fixes after review
  Sessions refactoring
  Standardize the name of the container configurator variable

Author: wouterj

_build/redirection_map

@@ -248,7 +248,8 @@
 /cookbook/session/index /session
 /cookbook/session/limit_metadata_writes /reference/configuration/framework
 /session/limit_metadata_writes /reference/configuration/framework
-/cookbook/session/locale_sticky_session /session/locale_sticky_session
+/cookbook/session/locale_sticky_session /session#locale-sticky-session
+/cookbook/locale_sticky_session /session#locale-sticky-session
 /cookbook/session/php_bridge /session/php_bridge
 /cookbook/session/proxy_examples /session/proxy_examples
 /cookbook/session/sessions_directory /session/sessions_directory
@@ -406,6 +407,7 @@
 /security/entity_provider /security/user_provider
 /session/avoid_session_start /session
 /session/sessions_directory /session
+/session/configuring_ttl /session#session-configure-ttl
 /frontend/encore/legacy-apps /frontend/encore/legacy-applications
 /configuration/external_parameters /configuration/environment_variables
 /contributing/code/patches /contributing/code/pull_requests
@@ -477,8 +479,9 @@
 /components/translation/custom_message_formatter https://github.com/symfony/translation
 /components/notifier https://github.com/symfony/notifier
 /components/routing https://github.com/symfony/routing
-/doctrine/pdo_session_storage /session/database
-/doctrine/mongodb_session_storage /session/database
+/session/database /session#session-database
+/doctrine/pdo_session_storage /session#session-database-pdo
+/doctrine/mongodb_session_storage /session#session-database-mongodb
 /components/dotenv https://github.com/symfony/dotenv
 /components/mercure /mercure
 /components/polyfill_apcu https://github.com/symfony/polyfill-apcu

bundles/best_practices.rst

@@ -442,8 +442,8 @@ The end user can provide values in any configuration file:
         // config/services.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        return static function (ContainerConfigurator $container) {
-            $container->parameters()
+        return static function (ContainerConfigurator $containerConfigurator) {
+            $containerConfigurator->parameters()
                 ->set('acme_blog.author.email', 'fabien@example.com')
             ;
         };

bundles/prepend_extension.rst

@@ -143,13 +143,13 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
         // config/packages/acme_something.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        return static function (ContainerConfigurator $container) {
-            $container->extension('acme_something', [
+        return static function (ContainerConfigurator $containerConfigurator) {
+            $containerConfigurator->extension('acme_something', [
                 // ...
                 'use_acme_goodbye' => false,
                 'entity_manager_name' => 'non_default',
             ]);
-            $container->extension('acme_other', [
+            $containerConfigurator->extension('acme_other', [
                 // ...
                 'use_acme_goodbye' => false,
             ]);

cache.rst

@@ -366,8 +366,8 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
             // config/services.php
             namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-            return function(ContainerConfigurator $configurator) {
-                $configurator->services()
+            return function(ContainerConfigurator $containerConfigurator) {
+                $containerConfigurator->services()
                     // ...
 
                     ->set('app.cache.adapter.redis')

components/dependency_injection.rst

@@ -291,13 +291,13 @@ config files:
 
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        return static function (ContainerConfigurator $container) {
-            $container->parameters()
+        return static function (ContainerConfigurator $containerConfigurator) {
+            $containerConfigurator->parameters()
                 // ...
                 ->set('mailer.transport', 'sendmail')
             ;
 
-            $services = $container->services();
+            $services = $containerConfigurator->services();
             $services->set('mailer', 'Mailer')
                 ->args(['%mailer.transport%'])
             ;

components/dependency_injection/_imports-parameters-note.rst.inc

@@ -31,6 +31,6 @@
             // config/services.php
             namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-            return static function (ContainerConfigurator $container) {
-                $container->import('%kernel.project_dir%/somefile.yaml');
+            return static function (ContainerConfigurator $containerConfigurator) {
+                $containerConfigurator->import('%kernel.project_dir%/somefile.yaml');
             };

components/http_foundation.rst

@@ -744,7 +744,7 @@ the response content will look like this:
 Session
 -------
 
-The session information is in its own document: :doc:`/components/http_foundation/sessions`.
+The session information is in its own document: :doc:`/session`.
 
 Safe Content Preference
 -----------------------
@@ -812,10 +812,9 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    /components/http_foundation/*
     /controller
     /controller/*
-    /session/*
+    /session
     /http_cache/*
 
 .. _nginx: https://www.nginx.com/resources/wiki/start/topics/examples/xsendfile/