Merge branch '3.4' into 4.2

* 3.4:
  Document the session.cache_limiter parameter
  Update spelling in slash_in_parameter.rst
  Fix classname for Psr6Cache
  [Console] Always use lazy commands

Author: javiereguiluz

components/cache/psr6_psr16_adapters.rst

@@ -74,13 +74,13 @@ the class instead. No problem! The Cache component provides the
 this use-case::
 
     use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-    use Symfony\Component\Cache\Simple\Psr16Cache;
+    use Symfony\Component\Cache\Simple\Psr6Cache;
 
     // the PSR-6 cache object that you want to use
     $psr6Cache = new FilesystemAdapter();
 
     // a PSR-16 cache that uses your cache internally!
-    $psr16Cache = new Psr16Cache($psr6Cache);
+    $psr16Cache = new Psr6Cache($psr6Cache);
 
     // now use this wherever you want
     $githubApiClient = new GitHubApiClient($psr16Cache);

components/console/changing_default_command.rst

@@ -16,10 +16,11 @@ name to the ``setDefaultCommand()`` method::
 
     class HelloWorldCommand extends Command
     {
+        protected static $defaultName = 'hello:world';
+
         protected function configure()
         {
-            $this->setName('hello:world')
-                ->setDescription('Outputs \'Hello World\'');
+            $this->setDescription('Outputs "Hello World"');
         }
 
         protected function execute(InputInterface $input, OutputInterface $output)

components/console/console_arguments.rst

@@ -23,10 +23,11 @@ Have a look at the following command that has three options::
 
     class DemoArgsCommand extends Command
     {
+        protected static $defaultName = 'demo:args';
+
         protected function configure()
         {
             $this
-                ->setName('demo:args')
                 ->setDescription('Describe args behaviors')
                 ->setDefinition(
                     new InputDefinition([

components/console/logger.rst

@@ -44,10 +44,11 @@ You can rely on the logger to use this dependency inside a command::
 
     class MyCommand extends Command
     {
+        protected static $defaultName = 'my:command';
+
         protected function configure()
         {
             $this
-                ->setName('my:command')
                 ->setDescription(
                     'Use an external dependency requiring a PSR-3 logger'
                 )

console/commands_as_services.rst

@@ -24,6 +24,7 @@ For example, suppose you want to log something from within your command::
 
     class SunshineCommand extends Command
     {
+        protected static $defaultName = 'app:sunshine';
         private $logger;
 
         public function __construct(LoggerInterface $logger)
@@ -37,7 +38,6 @@ For example, suppose you want to log something from within your command::
         protected function configure()
         {
             $this
-                ->setName('app:sunshine')
                 ->setDescription('Good morning!');
         }
 

console/hide_commands.rst

@@ -18,10 +18,11 @@ In those cases, you can define the command as **hidden** by setting the
 
     class LegacyCommand extends Command
     {
+        protected static $defaultName = 'app:legacy';
+
         protected function configure()
         {
             $this
-                ->setName('app:legacy')
                 ->setHidden(true)
                 // ...
             ;

reference/configuration/framework.rst

@@ -138,6 +138,7 @@ Configuration
 
 * `session`_
 
+  * `cache_limiter`_
   * `cookie_domain`_
   * `cookie_httponly`_
   * `cookie_lifetime`_
@@ -832,6 +833,50 @@ cookie_path
 This determines the path to set in the session cookie. By default, it will
 use ``/``.
 
+cache_limiter
+.............
+
+**type**: ``string`` or ``int`` **default**: ``''``
+
+If set to ``0``, Symfony won't set any particular header related to the cache
+and it will rely on the cache control method configured in the
+`session.cache-limiter`_ PHP.ini option.
+
+Unlike the other session options, ``cache_limiter`` is set as a regular
+:doc:`container parameter </service_container/parameters>`:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/services.yml
+        parameters:
+            session.storage.options:
+                cache_limiter: 0
+
+    .. code-block:: xml
+
+        <!-- app/config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <parameters>
+                <parameter key="session.storage.options" type="collection">
+                    <parameter key="cache_limiter">0</parameter>
+                </parameter>
+            </parameters>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/services.php
+        $container->setParameter('session.storage.options', [
+            'cache_limiter' => 0,
+        ]);
+
 cookie_domain
 .............
 
@@ -2333,3 +2378,4 @@ to know their differences.
 .. _`webpack-manifest-plugin`: https://www.npmjs.com/package/webpack-manifest-plugin
 .. _`error_reporting PHP option`: https://secure.php.net/manual/en/errorfunc.configuration.php#ini.error-reporting
 .. _`CSRF security attacks`: https://en.wikipedia.org/wiki/Cross-site_request_forgery
+.. _`session.cache-limiter`: https://www.php.net/manual/en/session.configuration.php#ini.session.cache-limiter

routing/slash_in_parameter.rst

@@ -87,7 +87,7 @@ That's it! Now, the ``{token}`` parameter can contain the ``/`` character.
     use the ``.+`` requirement for the parameters that allow slashes. For example,
     if the pattern is ``/share/{token}.{_format}`` and ``{token}`` allows any
     character, the ``/share/foo/bar.json`` URL will consider ``foo/bar.json``
-    as the token and the format will be empty. This can be solved replacing the
+    as the token and the format will be empty. This can be solved by replacing the
     ``.+`` requirement by ``[^.]+`` to allow any character except dots.
 
 .. note::