Resolve StaticType coming from dynamic return type extensions

ondrejmirtes · ondrejmirtes · commit 76b65b4a767b · 2021-02-08T14:48:16.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4637,9 +4637,8 @@ private function methodCallReturnType(Type $calledOnType, Type $typeWithMethod,
 
 		$methodReflection = $typeWithMethod->getMethod($methodName, $this);
 
+		$resolvedTypes = [];
 		if ($typeWithMethod instanceof TypeWithClassName) {
-			$resolvedTypes = [];
-
 			if ($methodCall instanceof MethodCall) {
 				foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicMethodReturnTypeExtensionsForClass($typeWithMethod->getClassName()) as $dynamicMethodReturnTypeExtension) {
 					if (!$dynamicMethodReturnTypeExtension->isMethodSupported($methodReflection)) {
@@ -4657,16 +4656,17 @@ private function methodCallReturnType(Type $calledOnType, Type $typeWithMethod,
 					$resolvedTypes[] = $dynamicStaticMethodReturnTypeExtension->getTypeFromStaticMethodCall($methodReflection, $methodCall, $this);
 				}
 			}
-			if (count($resolvedTypes) > 0) {
-				return TypeCombinator::union(...$resolvedTypes);
-			}
 		}
 
-		$methodReturnType = ParametersAcceptorSelector::selectFromArgs(
-			$this,
-			$methodCall->args,
-			$methodReflection->getVariants()
-		)->getReturnType();
+		if (count($resolvedTypes) > 0) {
+			$methodReturnType = TypeCombinator::union(...$resolvedTypes);
+		} else {
+			$methodReturnType = ParametersAcceptorSelector::selectFromArgs(
+				$this,
+				$methodCall->args,
+				$methodReflection->getVariants()
+			)->getReturnType();
+		}
 
 		if ($methodCall instanceof MethodCall) {
 			$calledOnThis = $calledOnType instanceof StaticType && $this->isInClass();
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -3235,7 +3235,7 @@ public function dataBinaryOperations(): array
 				'$simpleXMLWrongXpath',
 			],
 			[
-				'array<static(SimpleXMLElement)>|false',
+				'array<SimpleXMLElement>|false',
 				'$simpleXMLUnknownXpath',
 			],
 		];

Original file line number	Diff line number	Diff line change
`@@ -3235,7 +3235,7 @@ public function dataBinaryOperations(): array`
`3235`	`3235`	`'$simpleXMLWrongXpath',`
`3236`	`3236`	`],`
`3237`	`3237`	`[`
`3238`		`- 'array<static(SimpleXMLElement)>\|false',`
	`3238`	`+ 'array<SimpleXMLElement>\|false',`
`3239`	`3239`	`'$simpleXMLUnknownXpath',`
`3240`	`3240`	`],`
`3241`	`3241`	`];`