Merge branch '4.2'

* 4.2:
  add blank line before directive
  restructure paragraphs about sender and receiver
  fix indention

Author: javiereguiluz

components/messenger.rst

@@ -111,10 +111,10 @@ that will do the required processing for your message::
 
     class MyMessageHandler
     {
-       public function __invoke(MyMessage $message)
-       {
-           // Message processing...
-       }
+        public function __invoke(MyMessage $message)
+        {
+            // Message processing...
+        }
     }
 
 Adding Metadata to Messages (Envelopes)
@@ -199,13 +199,12 @@ transport will be responsible for communicating with your message broker or 3rd
 Your own Sender
 ~~~~~~~~~~~~~~~
 
-Using the :class:`Symfony\\Component\\Messenger\\Transport\\Sender\\SenderInterface`,
-you can create your own message sender.
 Imagine that you already have an ``ImportantAction`` message going through the
 message bus and being handled by a handler. Now, you also want to send this
 message as an email.
 
-First, create your sender::
+Using the :class:`Symfony\\Component\\Messenger\\Transport\\Sender\\SenderInterface`,
+you can create your own message sender::
 
     namespace App\MessageSender;
 
@@ -215,34 +214,34 @@ First, create your sender::
 
     class ImportantActionToEmailSender implements SenderInterface
     {
-       private $mailer;
-       private $toEmail;
-
-       public function __construct(\Swift_Mailer $mailer, string $toEmail)
-       {
-           $this->mailer = $mailer;
-           $this->toEmail = $toEmail;
-       }
-
-       public function send(Envelope $envelope): Envelope
-       {
-           $message = $envelope->getMessage();
-
-           if (!$message instanceof ImportantAction) {
-               throw new \InvalidArgumentException(sprintf('This transport only supports "%s" messages.', ImportantAction::class));
-           }
-
-           $this->mailer->send(
-               (new \Swift_Message('Important action made'))
-                   ->setTo($this->toEmail)
-                   ->setBody(
-                       '<h1>Important action</h1><p>Made by '.$message->getUsername().'</p>',
-                       'text/html'
-                   )
-           );
-
-           return $envelope;
-       }
+        private $mailer;
+        private $toEmail;
+
+        public function __construct(\Swift_Mailer $mailer, string $toEmail)
+        {
+            $this->mailer = $mailer;
+            $this->toEmail = $toEmail;
+        }
+
+        public function send(Envelope $envelope): Envelope
+        {
+            $message = $envelope->getMessage();
+
+            if (!$message instanceof ImportantAction) {
+                throw new \InvalidArgumentException(sprintf('This transport only supports "%s" messages.', ImportantAction::class));
+            }
+
+            $this->mailer->send(
+                (new \Swift_Message('Important action made'))
+                    ->setTo($this->toEmail)
+                    ->setBody(
+                        '<h1>Important action</h1><p>Made by '.$message->getUsername().'</p>',
+                        'text/html'
+                    )
+            );
+
+            return $envelope;
+        }
     }
 
 Your own Receiver
@@ -257,9 +256,7 @@ application but you can't use an API and need to use a shared CSV file with new
 orders.
 
 You will read this CSV file and dispatch a ``NewOrder`` message. All you need to
-do is to write your custom CSV receiver and Symfony will do the rest.
-
-First, create your receiver::
+do is to write your own CSV receiver::
 
     namespace App\MessageReceiver;
 
@@ -270,30 +267,30 @@ First, create your receiver::
 
     class NewOrdersFromCsvFileReceiver implements ReceiverInterface
     {
-       private $serializer;
-       private $filePath;
+        private $serializer;
+        private $filePath;
 
-       public function __construct(SerializerInterface $serializer, string $filePath)
-       {
+        public function __construct(SerializerInterface $serializer, string $filePath)
+        {
            $this->serializer = $serializer;
            $this->filePath = $filePath;
-       }
+        }
 
-       public function receive(callable $handler): void
-       {
-           $ordersFromCsv = $this->serializer->deserialize(file_get_contents($this->filePath), 'csv');
+        public function receive(callable $handler): void
+        {
+            $ordersFromCsv = $this->serializer->deserialize(file_get_contents($this->filePath), 'csv');
 
-           foreach ($ordersFromCsv as $orderFromCsv) {
-               $order = new NewOrder($orderFromCsv['id'], $orderFromCsv['account_id'], $orderFromCsv['amount']);
+            foreach ($ordersFromCsv as $orderFromCsv) {
+                $order = new NewOrder($orderFromCsv['id'], $orderFromCsv['account_id'], $orderFromCsv['amount']);
 
-               $handler(new Envelope($order));
-           }
-       }
+                $handler(new Envelope($order));
+            }
+        }
 
-       public function stop(): void
-       {
-           // noop
-       }
+        public function stop(): void
+        {
+            // noop
+        }
     }
 
 Receiver and Sender on the same Bus
@@ -306,6 +303,7 @@ middleware will know it should not route these messages again to a transport.
 
 Learn more
 ----------
+
 .. toctree::
     :maxdepth: 1
     :glob:

messenger.rst

@@ -827,6 +827,7 @@ will give you access to the following services:
 
 Learn more
 ----------
+
 .. toctree::
     :maxdepth: 1
     :glob:

testing.rst

@@ -733,7 +733,7 @@ Use the ``submitForm()`` method to submit the form that contains the given butto
     $client->request('GET', '/post/hello-world');
 
     $crawler = $client->submitForm('Add comment', [
-       'comment_form[content]' => '...',
+        'comment_form[content]' => '...',
     ]);
 
 The first argument of ``submitForm()`` is the text content, ``id``, ``value`` or

workflow.rst

@@ -533,6 +533,7 @@ requires:
                             metadata:
                                 priority: 0.5
                         # ...
+
     .. code-block:: xml
 
         <!-- config/packages/workflow.xml -->