Skip to content

perf: Reuse the QueryBuilder ObjectType #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
realFlowControl wants to merge 3 commits into
base: 2.0.x
Choose a base branch
from
Draft

perf: Reuse the QueryBuilder ObjectType #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c52fb70
Reuse the QueryBuilder ObjectType
realFlowControl Jul 17, 2026
f69cc54
Merge branch '2.0.x' into optimize/querybuilder-object-type-reuse
realFlowControl Jul 23, 2026
7e82e8c
Test nullable QueryBuilder return types
realFlowControl Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@

private OtherMethodQueryBuilderParser $otherMethodQueryBuilderParser;

private ObjectType $queryBuilderObjectType;

public function __construct(
OtherMethodQueryBuilderParser $otherMethodQueryBuilderParser
)
{
$this->otherMethodQueryBuilderParser = $otherMethodQueryBuilderParser;
$this->queryBuilderObjectType = new ObjectType(QueryBuilder::class);
}

public function getType(Expr $expr, Scope $scope): ?Type
Expand All @@ -50,7 +53,7 @@

$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $expr->getArgs(), $methodReflection->getVariants())->getReturnType();

$returnsQueryBuilder = (new ObjectType(QueryBuilder::class))->isSuperTypeOf($returnType)->yes();
$returnsQueryBuilder = $this->queryBuilderObjectType->isSuperTypeOf($returnType)->yes();

Check warning on line 56 in src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $expr->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		$returnsQueryBuilder = $this->queryBuilderObjectType->isSuperTypeOf($returnType)->yes();
+		$returnsQueryBuilder = !$this->queryBuilderObjectType->isSuperTypeOf($returnType)->no();
 
 		if (!$returnsQueryBuilder) {
 			return null;

Check warning on line 56 in src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $expr->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		$returnsQueryBuilder = $this->queryBuilderObjectType->isSuperTypeOf($returnType)->yes();
+		$returnsQueryBuilder = $returnType->isSuperTypeOf($this->queryBuilderObjectType)->yes();
 
 		if (!$returnsQueryBuilder) {
 			return null;

Check warning on line 56 in src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $expr->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		$returnsQueryBuilder = $this->queryBuilderObjectType->isSuperTypeOf($returnType)->yes();
+		$returnsQueryBuilder = !$this->queryBuilderObjectType->isSuperTypeOf($returnType)->no();
 
 		if (!$returnsQueryBuilder) {
 			return null;

Check warning on line 56 in src/Type/Doctrine/QueryBuilder/ReturnQueryBuilderExpressionTypeResolverExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $expr->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		$returnsQueryBuilder = $this->queryBuilderObjectType->isSuperTypeOf($returnType)->yes();
+		$returnsQueryBuilder = $returnType->isSuperTypeOf($this->queryBuilderObjectType)->yes();
 
 		if (!$returnsQueryBuilder) {
 			return null;

if (!$returnsQueryBuilder) {
return null;
Expand Down
12 changes: 12 additions & 0 deletions tests/Type/Doctrine/data/QueryResult/queryBuilderExpressionTypeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ public function testFirstClassCallableDoesNotFail(EntityManagerInterface $em): v
$this->getQueryBuilder(...);
}

public function testNullableQueryBuilderIsNotInferred(EntityManagerInterface $em): void
{
assertType('Doctrine\\ORM\\QueryBuilder|null', $this->getNullableQueryBuilder($em));
}

private function adjustQueryBuilderToIndexByInt(QueryBuilder $qb): void
{
$qb->indexBy('m', 'm.intColumn');
Expand Down Expand Up @@ -100,6 +105,13 @@ private static function getStaticQueryBuilder(EntityManagerInterface $em): Query
->from(Many::class, 'm');
}

private function getNullableQueryBuilder(EntityManagerInterface $em): ?QueryBuilder
{
return $em->createQueryBuilder()
->select('m')
->from(Many::class, 'm');
}

private function getBranchingQueryBuilder(EntityManagerInterface $em): QueryBuilder
{
$queryBuilder = $em->createQueryBuilder()
Expand Down
Loading