lsb

Author: staabm

src/Analyser/MutatingScope.php

@@ -1921,6 +1921,18 @@ public function resolveTypeByName(Name $name): TypeWithClassName
 		return new ObjectType($originalClass);
 	}
 
+	public function resolveStaticCallWithLateStaticBinding(Expr\StaticCall $expr): ?TypeWithClassName
+	{
+		$objectClasses = TypeCombinator::removeNull($this->getType($expr->class))->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
+		if (count($objectClasses) !== 1) {
+			return null;
+		}
+		if (!$expr->name instanceof Identifier) {
+			return null;
+		}
+		return $this->resolveTypeByNameWithLateStaticBinding(new Name($objectClasses[0]), $expr->name);
+	}
+
 	private function resolveTypeByNameWithLateStaticBinding(Name $class, Node\Identifier $name): TypeWithClassName
 	{
 		$classType = $this->resolveTypeByName($class);

src/Analyser/NodeScopeResolver.php

@@ -3309,7 +3309,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$classType = $scope->resolveTypeByName($expr->class);
 				$methodName = $expr->name->name;
 			} elseif ($expr->class instanceof Expr) {
-				$classType = TypeCombinator::removeNull($scope->getType($expr->class))->getObjectTypeOrClassStringObjectType();
+				$classType = $scope->resolveStaticCallWithLateStaticBinding($expr);
 				$methodName = $expr->name->name;
 			}
 
@@ -3323,11 +3323,9 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 						$methodReflection->getNamedArgumentsVariants(),
 					);
 
-					if (!$expr->class instanceof Expr) {
-						$methodThrowPoint = $this->getStaticMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
-						if ($methodThrowPoint !== null) {
-							$throwPoints[] = $methodThrowPoint;
-						}
+					$methodThrowPoint = $this->getStaticMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
+					if ($methodThrowPoint !== null) {
+						$throwPoints[] = $methodThrowPoint;
 					}
 
 					$declaringClass = $methodReflection->getDeclaringClass();