Fix $qb->expr()->isNull() and other methods that return scalars

Author: ondrejmirtes

src/Type/Doctrine/QueryBuilder/Expr/ExpressionBuilderDynamicReturnTypeExtension.php

@@ -64,9 +64,12 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			return $defaultReturnType;
 		}
 
-		$exprObject = $queryBuilder->expr()->{$methodReflection->getName()}(...$args);
+		$exprValue = $queryBuilder->expr()->{$methodReflection->getName()}(...$args);
+		if (is_object($exprValue)) {
+			return new ExprType(get_class($exprValue), $exprValue);
+		}
 
-		return new ExprType(get_class($exprObject), $exprObject);
+		return $scope->getTypeFromValue($exprValue);
 	}
 
 }

tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php

@@ -79,6 +79,14 @@ public function testRule(): void
 				'QueryBuilder: [Semantical Error] line 0, col 72 near \'nickname LIKE\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named nickname',
 				194,
 			],
+			[
+				'QueryBuilder: [Semantical Error] line 0, col 72 near \'nickname IS \': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named nickname',
+				206,
+			],
+			[
+				"QueryBuilder: [Syntax Error] line 0, col 80: Error: Expected =, <, <=, <>, >, >=, !=, got ')'\nDQL: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e WHERE e.id = 1 OR e.nickname) IS NULL",
+				218,
+			],
 		]);
 	}
 

tests/Rules/Doctrine/ORM/data/query-builder-dql.php

@@ -200,4 +200,28 @@ public function qbExpr(): void
 			->getQuery();
 	}
 
+	public function qbExprIsNull(): void
+	{
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->add('where', $queryBuilder->expr()->orX(
+				$queryBuilder->expr()->eq('e.id', '1'),
+				$queryBuilder->expr()->isNull('e.nickname')
+			))
+			->getQuery();
+	}
+
+	public function qbExprIsNullSyntaxError(): void
+	{
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->add('where', $queryBuilder->expr()->orX(
+				$queryBuilder->expr()->eq('e.id', '1'),
+				$queryBuilder->expr()->isNull('e.nickname)')
+			))
+			->getQuery();
+	}
+
 }