NewExprDynamicReturnTypeExtension - correct fallback in case of arguments exception

Author: ondrejmirtes

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

@@ -8,10 +8,10 @@
 use PHPStan\Broker\Broker;
 use PHPStan\Reflection\BrokerAwareExtension;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\Doctrine\ORM\DynamicQueryBuilderArgumentException;
 use PHPStan\Type\Doctrine\ArgumentsProcessor;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
 class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension, BrokerAwareExtension
@@ -58,9 +58,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 
 		$className = $scope->resolveName($methodCall->class);
 		if (!$this->broker->hasClass($className)) {
-			return ParametersAcceptorSelector::selectSingle(
-				$methodReflection->getVariants()
-			)->getReturnType();
+			return new ObjectType($className);
 		}
 
 		try {
@@ -72,9 +70,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 				)
 			);
 		} catch (DynamicQueryBuilderArgumentException $e) {
-			return ParametersAcceptorSelector::selectSingle(
-				$methodReflection->getVariants()
-			)->getReturnType();
+			return new ObjectType($this->broker->getClassName($className));
 		}
 
 		return new ExprType($className, $exprObject);

tests/Type/Doctrine/NewExprTest.php

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

tests/Type/Doctrine/data/bug-191.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Bug191;
+
+use Doctrine\ORM\Query\Expr\Func;
+use Doctrine\ORM\Query\Expr\Literal;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function getTopicConcatExpression(): void
+	{
+		$func = new Func('CONCAT_WS', [
+			new Literal("'.'"),
+			'event.type.businessDomain',
+			'event.type.group',
+			'event.type.resource',
+			'event.type.subResource',
+			'event.type.action',
+			'event.type.version',
+		]);
+		assertType(Func::class, $func);
+	}
+
+}