Merge branch '5.4' into 6.0

* 5.4:
  remove display names from envelope headers
  Fix use statement
  Remove reference to a removed configuration key
  [Workflow] fix image labels

Author: javiereguiluz

_images/components/workflow/states_transitions.png

@@ -34,7 +34,7 @@ This is how the extension of an AcmeHelloBundle should look like::
     namespace Acme\HelloBundle\DependencyInjection;
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+    use Symfony\Component\DependencyInjection\Extension\Extension;
 
     class AcmeHelloExtension extends Extension
     {

bundles/extension.rst

@@ -494,7 +494,6 @@ and headers.
             mailer:
                 envelope:
                     sender: 'fabien@example.com'
-                    # sender: 'Fabien <fabien@example.com>' (use this to add a display name)
                     recipients: ['foo@example.com', 'bar@example.com']
                 headers:
                     From: 'Fabien <fabien@example.com>'
@@ -517,8 +516,6 @@ and headers.
                 <framework:mailer>
                     <framework:envelope>
                         <framework:sender>fabien@example.com</framework:sender>
-                        <!-- use this to add a display name:
-                        <framework:sender>Fabien &lt;fabien@example.com&gt;</framework:sender> -->
                         <framework:recipients>foo@example.com</framework:recipients>
                         <framework:recipients>bar@example.com</framework:recipients>
                     </framework:envelope>
@@ -539,7 +536,6 @@ and headers.
             $mailer
                 ->envelope()
                     ->sender('fabien@example.com')
-                    // ->sender('Fabien <fabien@example.com>') (use this to add a display name)
                     ->recipients(['foo@example.com', 'bar@example.com'])
             ;
 

mailer.rst

@@ -2440,19 +2440,6 @@ Whether or not to enable validation support.
 This option will automatically be set to ``true`` when one of the child
 settings is configured.
 
-.. _reference-validation-cache:
-
-cache
-.....
-
-**type**: ``string``
-
-The service that is used to persist class metadata in a cache. The service
-has to implement the :class:`Symfony\\Contracts\\Cache\\CacheInterface`.
-
-Set this option to ``validator.mapping.cache.doctrine.apc`` to use the APC
-cache provided by the Doctrine project.
-
 .. _reference-validation-enable_annotations:
 
 enable_annotations