Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit eaa2fc7f4bb4 · 2022-09-29T08:57:38.000+02:00
* 5.4:
  remove display names from envelope headers
  Fix use statement
  Remove reference to a removed configuration key
  [Workflow] fix image labels
diff --git a/_images/components/workflow/states_transitions.png b/_images/components/workflow/states_transitions.png
diff --git a/bundles/extension.rst b/bundles/extension.rst
@@ -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
     {
diff --git a/mailer.rst b/mailer.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'])
             ;
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.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

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ This is how the extension of an AcmeHelloBundle should look like::`
`34`	`34`	`namespace Acme\HelloBundle\DependencyInjection;`
`35`	`35`
`36`	`36`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`37`		`- use Symfony\Component\HttpKernel\DependencyInjection\Extension;`
	`37`	`+ use Symfony\Component\DependencyInjection\Extension\Extension;`
`38`	`38`
`39`	`39`	`class AcmeHelloExtension extends Extension`
`40`	`40`	`{`
-Original file line number
+Diff line change
             mailer:
                 envelope:
                     sender: '[email protected]'
 -                    # sender: 'Fabien <[email protected]>' (use this to add a display name)
                     recipients: ['[email protected]', '[email protected]']
                 headers:
                     From: 'Fabien <[email protected]>'
                 <framework:mailer>
                     <framework:envelope>
                         <framework:sender>[email protected]</framework:sender>
 -                        <!-- use this to add a display name:
 -                        <framework:sender>Fabien &lt;[email protected]&gt;</framework:sender> -->
                         <framework:recipients>[email protected]</framework:recipients>
                         <framework:recipients>[email protected]</framework:recipients>
                     </framework:envelope>
             $mailer
                 ->envelope()
                     ->sender('[email protected]')
 -                    // ->sender('Fabien <fabien@example.com>') (use this to add a display name)
                     ->recipients(['[email protected]', '[email protected]'])
+            ;