merged branch armetiz/master (PR #8045)

This PR was squashed before being merged into the master branch (closes #8045).

Discussion
----------

[Form] Add missing type hint

Commits
-------

4dccee6 [Form] Add missing type hint

src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -13,6 +13,7 @@ namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\DBAL\Connection;
 
 /**
@@ -33,13 +34,13 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
     /**
      * Construct an ORM Query Builder Loader
      *
-     * @param QueryBuilder|\Closure $queryBuilder
-     * @param EntityManager         $manager
-     * @param string                $class
+     * @param QueryBuilder|\Closure  $queryBuilder
+     * @param EntityManagerInterface $manager
+     * @param string                 $class
      *
      * @throws UnexpectedTypeException
      */
-    public function __construct($queryBuilder, $manager = null, $class = null)
+    public function __construct($queryBuilder, EntityManagerInterface $manager = null, $class = null)
     {
         // If a query builder was passed, it must be a closure or QueryBuilder
         // instance