bug #34765 [DoctrineBridge] Removed QueryBuilder type hint in getLoader() (HeahDude)

fabpot · fabpot · commit 6b7029b0112a · 2019-12-05T07:12:07.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [DoctrineBridge] Removed QueryBuilder type hint in getLoader() | Q | A | ------------- | --- | Branch? | 5.0  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | ~ | License | MIT | Doc PR | ~  Follows #34600. Commits ------- 8621852 [DoctrineBridge] Removed QueryBuilder type hint in getLoader()
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -263,9 +263,11 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * Return the default loader object.
      *
+     * @param mixed $queryBuilder
+     *
      * @return EntityLoaderInterface
      */
-    abstract public function getLoader(ObjectManager $manager, QueryBuilder $queryBuilder, string $class);
+    abstract public function getLoader(ObjectManager $manager, $queryBuilder, string $class);
 
     public function getParent()
     {
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -46,9 +46,11 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * Return the default loader object.
      *
+     * @param QueryBuilder $queryBuilder
+     *
      * @return ORMQueryBuilderLoader
      */
-    public function getLoader(ObjectManager $manager, QueryBuilder $queryBuilder, string $class)
+    public function getLoader(ObjectManager $manager, $queryBuilder, string $class)
     {
         if (!$queryBuilder instanceof QueryBuilder) {
             throw new \TypeError(sprintf('Expected an instance of %s, but got %s.', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder)));

Original file line number	Diff line number	Diff line change
`@@ -263,9 +263,11 @@ public function configureOptions(OptionsResolver $resolver)`
`263`	`263`	`/**`
`264`	`264`	`* Return the default loader object.`
`265`	`265`	`*`
	`266`	`+ * @param mixed $queryBuilder`
	`267`	`+ *`
`266`	`268`	`* @return EntityLoaderInterface`
`267`	`269`	`*/`
`268`		`- abstract public function getLoader(ObjectManager $manager, QueryBuilder $queryBuilder, string $class);`
	`270`	`+ abstract public function getLoader(ObjectManager $manager, $queryBuilder, string $class);`
`269`	`271`
`270`	`272`	`public function getParent()`
`271`	`273`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,11 @@ public function configureOptions(OptionsResolver $resolver)`
`46`	`46`	`/**`
`47`	`47`	`* Return the default loader object.`
`48`	`48`	`*`
	`49`	`+ * @param QueryBuilder $queryBuilder`
	`50`	`+ *`
`49`	`51`	`* @return ORMQueryBuilderLoader`
`50`	`52`	`*/`
`51`		`- public function getLoader(ObjectManager $manager, QueryBuilder $queryBuilder, string $class)`
	`53`	`+ public function getLoader(ObjectManager $manager, $queryBuilder, string $class)`
`52`	`54`	`{`
`53`	`55`	`if (!$queryBuilder instanceof QueryBuilder) {`
`54`	`56`	`throw new \TypeError(sprintf('Expected an instance of %s, but got %s.', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder)));`