simplify

Author: staabm

src/Analyser/MutatingScope.php

@@ -1921,19 +1921,7 @@ 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
+	public function resolveTypeByNameWithLateStaticBinding(Name $class, Node\Identifier $name): TypeWithClassName
 	{
 		$classType = $this->resolveTypeByName($class);
 

src/Analyser/NodeScopeResolver.php

@@ -3309,8 +3309,11 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$classType = $scope->resolveTypeByName($expr->class);
 				$methodName = $expr->name->name;
 			} elseif ($expr->class instanceof Expr) {
-				$classType = $scope->resolveStaticCallWithLateStaticBinding($expr);
-				$methodName = $expr->name->name;
+				$objectClasses = TypeCombinator::removeNull($scope->getType($expr->class))->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
+				if (count($objectClasses) === 1) {
+					$classType = $scope->resolveTypeByNameWithLateStaticBinding(new Name($objectClasses[0]), $expr->name);
+					$methodName = $expr->name->name;
+				}
 			}
 
 			if ($classType !== null && $methodName !== null) {