Test for first class callable issue

Author: janedbal

tests/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtensionTest.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine\QueryBuilder;
+
+use PHPStan\Testing\TypeInferenceTestCase;
+
+class ReturnQueryBuilderExpressionTypeResolverExtensionTest extends TypeInferenceTestCase
+{
+
+	/** @return iterable<mixed> */
+	public function dataFileAsserts(): iterable
+	{
+		yield from $this->gatherAssertTypes(__DIR__ . '/../data/QueryResult/queryBuilderExpressionTypeResolver.php');
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+	/** @return string[] */
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [__DIR__ . '/../data/QueryResult/config.neon'];
+	}
+
+}

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

@@ -0,0 +1,57 @@
+<?php declare(strict_types = 1);
+
+namespace QueryResult\CreateQuery;
+
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr\From;
+use Doctrine\ORM\QueryBuilder;
+use QueryResult\Entities\Many;
+use function PHPStan\Testing\assertType;
+
+class QueryBuilderGetQuery
+{
+
+	public function testQueryTypeIsInferredOnAcrossMethods(EntityManagerInterface $em): void
+	{
+		$query = $this->getQueryBuilder($em)->getQuery();
+		$branchingQuery = $this->getBranchingQueryBuilder($em)->getQuery();
+
+		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $query);
+		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $branchingQuery);
+	}
+
+	public function testQueryTypeIsInferredOnAcrossMethodsEvenWhenVariableAssignmentIsUsed(EntityManagerInterface $em): void
+	{
+		$queryBuilder = $this->getQueryBuilder($em);
+
+		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $queryBuilder->getQuery());
+	}
+
+	public function testFirstClassCallableDoesNotFail(EntityManagerInterface $em): void
+	{
+		$this->getQueryBuilder(...);
+	}
+
+	private function getQueryBuilder(EntityManagerInterface $em): QueryBuilder
+	{
+		return $em->createQueryBuilder()
+			->select('m')
+			->from(Many::class, 'm');
+	}
+
+	private function getBranchingQueryBuilder(EntityManagerInterface $em): QueryBuilder
+	{
+		$queryBuilder = $em->createQueryBuilder()
+			->select('m')
+			->from(Many::class, 'm');
+
+		if (random_int(0, 1) === 1) {
+			$queryBuilder->andWhere('m.intColumn = 1');
+		}
+
+		return $queryBuilder;
+	}
+}

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

@@ -233,39 +233,4 @@ public function testDynamicMethodCall(
 		assertType('mixed', $result);
 	}
 
-	public function testQueryTypeIsInferredOnAcrossMethods(EntityManagerInterface $em): void
-	{
-		$query = $this->getQueryBuilder($em)->getQuery();
-		$branchingQuery = $this->getBranchingQueryBuilder($em)->getQuery();
-
-		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $query);
-		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $branchingQuery);
-	}
-
-	public function testQueryTypeIsInferredOnAcrossMethodsEvenWhenVariableAssignmentIsUsed(EntityManagerInterface $em): void
-	{
-		$queryBuilder = $this->getQueryBuilder($em);
-
-		assertType('Doctrine\ORM\Query<null, QueryResult\Entities\Many>', $queryBuilder->getQuery());
-	}
-
-	private function getQueryBuilder(EntityManagerInterface $em): QueryBuilder
-	{
-		return $em->createQueryBuilder()
-			->select('m')
-			->from(Many::class, 'm');
-	}
-
-	private function getBranchingQueryBuilder(EntityManagerInterface $em): QueryBuilder
-	{
-		$queryBuilder = $em->createQueryBuilder()
-			->select('m')
-			->from(Many::class, 'm');
-
-		if (random_int(0, 1) === 1) {
-			$queryBuilder->andWhere('m.intColumn = 1');
-		}
-
-		return $queryBuilder;
-	}
 }