Fix custom entity repository

Author: janedbal

src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php

@@ -48,8 +48,8 @@ public function getType(Expr $expr, Scope $scope): ?Type
 			if ($callerClassReflection->is(QueryBuilder::class)) {
 				return null; // covered by QueryBuilderMethodDynamicReturnTypeExtension
 			}
-			if ($callerClassReflection->is(EntityRepository::class)) {
-				return null; // createQueryBuilder covered by EntityRepositoryCreateQueryBuilderDynamicReturnTypeExtension
+			if ($callerClassReflection->is(EntityRepository::class) && $expr->name->name === 'createQueryBuilder') {
+				return null; // covered by EntityRepositoryCreateQueryBuilderDynamicReturnTypeExtension
 			}
 		}
 

tests/Type/Doctrine/data/QueryResult/queryBuilderExpressionTypeResolver.php

@@ -5,6 +5,7 @@
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\Query\Expr\From;
 use Doctrine\ORM\QueryBuilder;
@@ -14,6 +15,11 @@
 class QueryBuilderExpressionTypeResolverTest
 {
 
+	/**
+	 * @var MyRepository
+	 */
+	private $myRepository;
+
 	public function testQueryTypeIsInferredOnAcrossMethods(EntityManagerInterface $em): void
 	{
 		$query = $this->getQueryBuilder($em)->getQuery();
@@ -30,6 +36,13 @@ public function testQueryTypeIsInferredOnAcrossMethodsEvenWhenVariableAssignment
 		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $queryBuilder->getQuery());
 	}
 
+	public function testDiveIntoCustomEntityRepository(EntityManagerInterface $em): void
+	{
+		$queryBuilder = $this->myRepository->getCustomQueryBuilder($em);
+
+		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $queryBuilder->getQuery());
+	}
+
 	public function testFirstClassCallableDoesNotFail(EntityManagerInterface $em): void
 	{
 		$this->getQueryBuilder(...);
@@ -55,3 +68,13 @@ private function getBranchingQueryBuilder(EntityManagerInterface $em): QueryBuil
 		return $queryBuilder;
 	}
 }
+
+class MyRepository extends EntityRepository {
+
+	private function getCustomQueryBuilder(EntityManagerInterface $em): QueryBuilder
+	{
+		return $em->createQueryBuilder()
+			->select('m')
+			->from(Many::class, 'm');
+	}
+}