Merge branch '3.4' into 4.2

* 3.4:
  [Cache] Updated invalid service names
  Show how to configure lifetime for app.cache.

Author: javiereguiluz

cache.rst

@@ -259,6 +259,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
         # config/packages/cache.yaml
         framework:
             cache:
+                app: my_configured_app_cache
                 pools:
                     my_cache_pool:
                         adapter: cache.adapter.memcached
@@ -269,6 +270,10 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
                     cache.long_cache:
                         adapter: my_cache_pool
                         default_lifetime: 604800
+                    my_configured_app_cache:
+                        # "cache.adapter.filesystem" is the default for "cache.app"
+                        adapter: cache.adapter.filesystem
+                        default_lifetime: 3600
 
     .. code-block:: xml
 
@@ -281,10 +286,12 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <framework:config>
-                <framework:cache>
+                <framework:cache app="my_cache_pool">
                   <framework:pool name="my_cache_pool" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
                   <framework:pool name="cache.short_cache" adapter="my_cache_pool" default_lifetime="604800"/>
                   <framework:pool name="cache.long_cache" adapter="my_cache_pool" default_lifetime="604800"/>
+                  <!-- "cache.adapter.filesystem" is the default for "cache.app" -->
+                  <framework:pool name="my_configured_app_cache" adapter="cache.adapter.filesystem" default_lifetime="3600"/>
                 </framework:cache>
             </framework:config>
         </container>
@@ -294,6 +301,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
         // config/packages/cache.php
         $container->loadFromExtension('framework', [
             'cache' => [
+                'app' => 'my_configured_app_cache',
                 'pools' => [
                     'my_cache_pool' => [
                         'adapter' => 'cache.adapter.memcached',
@@ -307,6 +315,11 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
                         'adapter' => 'cache.adapter.memcached',
                         'default_lifetime' => 604800,
                     ],
+                    'my_configured_app_cache' => [
+                        // "cache.adapter.filesystem" is the default for "cache.app"
+                        'adapter' => 'cache.adapter.filesystem',
+                        'default_lifetime' => 3600,
+                    ],
                 ],
             ],
         ]);

controller/upload_file.rst

@@ -333,7 +333,7 @@ Using a Doctrine Listener
 
 If you are using Doctrine to store the Product entity, you can create a
 :doc:`Doctrine listener </doctrine/event_listeners_subscribers>` to
-automatically upload the file when persisting the entity::
+automatically move the file when persisting the entity::
 
     // src/EventListener/BrochureUploadListener.php
     namespace App\EventListener;

reference/configuration/framework.rst

@@ -1984,30 +1984,30 @@ default_doctrine_provider
 **type**: ``string``
 
 The service name to use as your default Doctrine provider. The provider is
-available as the ``cache.doctrine`` service.
+available as the ``cache.default_doctrine_provider`` service.
 
 default_psr6_provider
 .....................
 
 **type**: ``string``
 
 The service name to use as your default PSR-6 provider. It is available as
-the ``cache.psr6`` service.
+the ``cache.default_psr6_provider`` service.
 
 default_redis_provider
 ......................
 
 **type**: ``string`` **default**: ``redis://localhost``
 
-The DSN to use by the Redis provider. The provider is available as the ``cache.redis``
+The DSN to use by the Redis provider. The provider is available as the ``cache.default_redis_provider``
 service.
 
 default_memcached_provider
 ..........................
 
 **type**: ``string`` **default**: ``memcached://localhost``
 
-The DSN to use by the Memcached provider. The provider is available as the ``cache.memcached``
+The DSN to use by the Memcached provider. The provider is available as the ``cache.default_memcached_provider``
 service.
 
 default_pdo_provider