do not depend on the QueryBuilder from the ORM

xabbuh · xabbuh · commit 409ed80500a3 · 2019-11-29T13:09:10.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -14,7 +14,6 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
@@ -85,13 +84,16 @@ public static function createChoiceName($choice, $key, $value): string
      * For instance in ORM two query builders with an equal SQL string and
      * equal parameters are considered to be equal.
      *
+     * @param object $queryBuilder A query builder, type declaration is not present here as there
+     *                             is no common base class for the different implementations
+     *
      * @return array|null Array with important QueryBuilder parts or null if
      *                    they can't be determined
      *
      * @internal This method is public to be usable as callback. It should not
      *           be used in user code.
      */
-    public function getQueryBuilderPartsForCachingHash(QueryBuilder $queryBuilder): ?array
+    public function getQueryBuilderPartsForCachingHash($queryBuilder): ?array
     {
         return null;
     }
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -68,10 +68,12 @@ public function getBlockPrefix()
      * We consider two query builders with an equal SQL string and
      * equal parameters to be equal.
      *
+     * @param QueryBuilder $queryBuilder
+     *
      * @internal This method is public to be usable as callback. It should not
      *           be used in user code.
      */
-    public function getQueryBuilderPartsForCachingHash(QueryBuilder $queryBuilder): ?array
+    public function getQueryBuilderPartsForCachingHash($queryBuilder): ?array
     {
         return [
             $queryBuilder->getQuery()->getSQL(),

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,12 @@ public function getBlockPrefix()`
`68`	`68`	`* We consider two query builders with an equal SQL string and`
`69`	`69`	`* equal parameters to be equal.`
`70`	`70`	`*`
	`71`	`+ * @param QueryBuilder $queryBuilder`
	`72`	`+ *`
`71`	`73`	`* @internal This method is public to be usable as callback. It should not`
`72`	`74`	`* be used in user code.`
`73`	`75`	`*/`
`74`		`- public function getQueryBuilderPartsForCachingHash(QueryBuilder $queryBuilder): ?array`
	`76`	`+ public function getQueryBuilderPartsForCachingHash($queryBuilder): ?array`
`75`	`77`	`{`
`76`	`78`	`return [`
`77`	`79`	`$queryBuilder->getQuery()->getSQL(),`