Merge branch '4.4' into 5.1

* 4.4:
  Enhancement: New rule - SpaceBetweenLabelAndLinkInDoc
  Update user_provider.rst

Author: OskarStark

.doctor-rst.yaml

@@ -30,6 +30,7 @@ rules:
     replace_code_block_types: ~
     replacement: ~
     short_array_syntax: ~
+    space_between_label_and_link_in_doc: ~
     space_between_label_and_link_in_ref: ~
     typo: ~
     unused_links: ~

contributing/code_of_conduct/code_of_conduct.rst

@@ -37,7 +37,7 @@ Examples of unacceptable behavior by participants include:
 Our Responsibilities
 --------------------
 
-:doc:`CoC Active Response Ensurers, or CARE</contributing/code_of_conduct/care_team>`,
+:doc:`CoC Active Response Ensurers, or CARE </contributing/code_of_conduct/care_team>`,
 are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.

contributing/map.rst.inc

@@ -16,9 +16,9 @@
   * :doc:`Security </contributing/code/security>`
   * :doc:`Tests </contributing/code/tests>`
   * :doc:`Backward Compatibility </contributing/code/bc>`
-  * :doc:`Coding Standards</contributing/code/standards>`
-  * :doc:`Code Conventions</contributing/code/conventions>`
-  * :doc:`Git</contributing/code/git>`
+  * :doc:`Coding Standards </contributing/code/standards>`
+  * :doc:`Code Conventions </contributing/code/conventions>`
+  * :doc:`Git </contributing/code/git>`
   * :doc:`License </contributing/code/license>`
 
 * **Documentation**

deployment/proxies.rst

@@ -3,7 +3,7 @@ How to Configure Symfony to Work behind a Load Balancer or a Reverse Proxy
 
 When you deploy your application, you may be behind a load balancer (e.g.
 an AWS Elastic Load Balancing) or a reverse proxy (e.g. Varnish for
-:doc:`caching</http_cache>`).
+:doc:`caching </http_cache>`).
 
 For the most part, this doesn't cause any problems with Symfony. But, when
 a request passes through a proxy, certain request information is sent using

frontend/encore/simple-example.rst

@@ -121,8 +121,8 @@ be executed. All the CSS files that were required will also be displayed.
 The ``encore_entry_link_tags()`` and ``encore_entry_script_tags()`` functions
 read from an ``entrypoints.json`` file that's generated by Encore to know the exact
 filename(s) to render. This file is *especially* useful because you can
-:doc:`enable versioning</frontend/encore/versioning>` or
-:doc:`point assets to a CDN</frontend/encore/cdn>` without making *any* changes to your
+:doc:`enable versioning </frontend/encore/versioning>` or
+:doc:`point assets to a CDN </frontend/encore/cdn>` without making *any* changes to your
 template: the paths in ``entrypoints.json`` will always be the final, correct paths.
 
 If you're *not* using Symfony, you can ignore the ``entrypoints.json`` file and

reference/constraints/map.rst.inc

@@ -23,7 +23,7 @@ String Constraints
 * :doc:`Hostname </reference/constraints/Hostname>`
 * :doc:`Ip </reference/constraints/Ip>`
 * :doc:`Json</reference/constraints/Json>`
-* :doc:`Uuid</reference/constraints/Uuid>`
+* :doc:`Uuid </reference/constraints/Uuid>`
 * :doc:`UserPassword </reference/constraints/UserPassword>`
 * :doc:`NotCompromisedPassword </reference/constraints/NotCompromisedPassword>`
 

reference/forms/types/options/validation_groups.rst.inc

@@ -49,7 +49,7 @@ the option. Symfony will then pass the form when calling it::
 .. note::
 
     When your form contains multiple submit buttons, you can change the
-    validation group depending on :doc:`which button is used</form/button_based_validation>`
+    validation group depending on :doc:`which button is used </form/button_based_validation>`
     to submit the form.
 
     If you need advanced logic to determine the validation groups have

reference/forms/types/submit.rst

@@ -21,7 +21,7 @@ A submit button.
 |                      | - `translation_domain`_                                              |
 |                      | - `validation_groups`_                                               |
 +----------------------+----------------------------------------------------------------------+
-| Parent type          | :doc:`ButtonType</reference/forms/types/button>`                     |
+| Parent type          | :doc:`ButtonType </reference/forms/types/button>`                    |
 +----------------------+----------------------------------------------------------------------+
 | Class                | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType` |
 +----------------------+----------------------------------------------------------------------+

security/user_provider.rst

@@ -128,23 +128,24 @@ interface only requires one method: ``loadUserByUsername($username)``::
     // src/Repository/UserRepository.php
     namespace App\Repository;
 
-    use Doctrine\ORM\EntityRepository;
+    use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
     use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
 
-    class UserRepository extends EntityRepository implements UserLoaderInterface
+    class UserRepository extends ServiceEntityRepository implements UserLoaderInterface
     {
         // ...
 
         public function loadUserByUsername($usernameOrEmail)
         {
-            return $this->createQuery(
+            $entityManager = $this->getEntityManager();
+            
+            return $entityManager->createQuery(
                     'SELECT u
                     FROM App\Entity\User u
                     WHERE u.username = :query
                     OR u.email = :query'
                 )
                 ->setParameter('query', $usernameOrEmail)
-                ->getQuery()
                 ->getOneOrNullResult();
         }
     }