Merge branch '4.3' into 4.4

* 4.3:
  Fix markup
  Update mailer.rst
  Use .xlf extension
  Removed blank line after filepath
  Ordered use statements
  Blank line after directive and no blank line after filepath

Author: wouterj

bundles/best_practices.rst

@@ -354,7 +354,6 @@ following standardized instructions in your ``README.md`` file.
         in the ``config/bundles.php`` file of your project::
 
             // config/bundles.php
-
             return [
                 // ...
                 <vendor>\<bundle-name>\<bundle-long-name>::class => ['all' => true],

components/http_client.rst

@@ -488,9 +488,9 @@ for next requests. The implementation leverages the
 so that the :doc:`HttpKernel component </components/http_kernel>` needs to be
 installed in your application::
 
-    use Symfony\Component\HttpClient\HttpClient;
     use Symfony\Component\HttpClient\CachingHttpClient;
     use Symfony\Component\HttpKernel\HttpCache\Store;
+    use Symfony\Component\HttpClient\HttpClient;
 
     $store = new Store('/path/to/cache/storage/');
     $client = HttpClient::create();

contributing/code/pull_requests.rst

@@ -129,7 +129,7 @@ work:
   </contributing/code/maintenance>` (you may have to choose a higher branch if
   the feature you are fixing was introduced in a later version);
 
- * ``master``, if you are adding a new feature.
+* ``master``, if you are adding a new feature.
 
 .. note::
 

doctrine.rst

@@ -427,11 +427,10 @@ some basic validation tasks::
     // src/Controller/ProductController.php
     namespace App\Controller;
 
-    // ...
+    use App\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-    use App\Entity\Product;
+    // ...
 
     class ProductController extends AbstractController
     {

mailer.rst

@@ -2,6 +2,7 @@ Sending Emails with Mailer
 ==========================
 
 .. versionadded:: 4.3
+
     The Mailer component was added in Symfony 4.3 and is currently experimental.
     The previous solution - Swift Mailer - is still valid: :doc:`Swift Mailer</email>`.
 
@@ -62,7 +63,6 @@ You'll now have a new line in your ``.env`` file that you can uncomment:
 .. code-block:: bash
 
     # .env
-
     SENDGRID_KEY=
     MAILER_DSN=smtp://$SENDGRID_KEY@sendgrid
 
@@ -376,7 +376,7 @@ image files as usual. First, to simplify things, define a Twig namespace called
 
         paths:
             # point this wherever your images live
-            images: '%kernel.project_dir%/assets/images'
+            '%kernel.project_dir%/assets/images': images
 
 Now, use the special ``email.image()`` Twig helper to embed the images inside
 the email contents:

messenger.rst

@@ -947,6 +947,7 @@ Serializing Messages
 ~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 4.3
+
     The default serializer changed in 4.3 from the Symfony serializer to the
     native PHP serializer. Existing applications should configure their transports
     to use the Symfony serializer to avoid losing already-queued messages after

translation/debug.rst

@@ -38,7 +38,7 @@ you've already setup some translations for the ``fr`` locale:
 
     .. code-block:: xml
 
-        <!-- translations/messages.fr.xliff -->
+        <!-- translations/messages.fr.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -69,7 +69,7 @@ and for the ``en`` locale:
 
     .. code-block:: xml
 
-        <!-- translations/messages.en.xliff -->
+        <!-- translations/messages.en.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">