Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit 7d61ea2c90eb · 2022-01-22T18:47:06.000+01:00
* 6.0:
  Capitalise From and Bcc header names in global mailer configuration
diff --git a/mailer.rst b/mailer.rst
@@ -492,8 +492,8 @@ and headers.
                     sender: 'fabien@example.com'
                     recipients: ['foo@example.com', 'bar@example.com']
                 headers:
-                    from: 'Fabien <fabien@example.com>'
-                    bcc: 'baz@example.com'
+                    From: 'Fabien <fabien@example.com>'
+                    Bcc: 'baz@example.com'
                     X-Custom-Header: 'foobar'
 
     .. code-block:: xml
@@ -515,8 +515,8 @@ and headers.
                         <framework:recipients>foo@example.com</framework:recipients>
                         <framework:recipients>bar@example.com</framework:recipients>
                     </framework:envelope>
-                    <framework:header name="from">Fabien &lt;fabien@example.com&gt;</framework:header>
-                    <framework:header name="bcc">baz@example.com</framework:header>
+                    <framework:header name="From">Fabien &lt;fabien@example.com&gt;</framework:header>
+                    <framework:header name="Bcc">baz@example.com</framework:header>
                     <framework:header name="X-Custom-Header">foobar</framework:header>
                 </framework:mailer>
             </framework:config>
@@ -535,8 +535,8 @@ and headers.
                     ->recipients(['foo@example.com', 'bar@example.com'])
             ;
 
-            $mailer->header('from')->value('Fabien <fabien@example.com>');
-            $mailer->header('bcc')->value('baz@example.com');
+            $mailer->header('From')->value('Fabien <fabien@example.com>');
+            $mailer->header('Bcc')->value('baz@example.com');
             $mailer->header('X-Custom-Header')->value('foobar');
         };
 

-Original file line number
+Diff line change
                     sender: '[email protected]'
                     recipients: ['[email protected]', '[email protected]']
                 headers:
 -                    from: 'Fabien <[email protected]>'
 -                    bcc: '[email protected]'
 +                    From: 'Fabien <[email protected]>'
 +                    Bcc: '[email protected]'
                     X-Custom-Header: 'foobar'
     .. code-block:: xml
                         <framework:recipients>[email protected]</framework:recipients>
                         <framework:recipients>[email protected]</framework:recipients>
                     </framework:envelope>
 -                    <framework:header name="from">Fabien &lt;[email protected]&gt;</framework:header>
 -                    <framework:header name="bcc">[email protected]</framework:header>
 +                    <framework:header name="From">Fabien &lt;[email protected]&gt;</framework:header>
 +                    <framework:header name="Bcc">[email protected]</framework:header>
                     <framework:header name="X-Custom-Header">foobar</framework:header>
                 </framework:mailer>
             </framework:config>
                     ->recipients(['[email protected]', '[email protected]'])
+            ;
 -            $mailer->header('from')->value('Fabien <fabien@example.com>');
 -            $mailer->header('bcc')->value('[email protected]');
 +            $mailer->header('From')->value('Fabien <fabien@example.com>');
 +            $mailer->header('Bcc')->value('[email protected]');
             $mailer->header('X-Custom-Header')->value('foobar');
         };