Pass Node\Expr rather than class name to invalidateStaticMembers

Author: takaram

src/Analyser/MutatingScope.php

@@ -3643,16 +3643,15 @@ private function invalidateMethodsOnExpression(Expr $expressionToInvalidate): se
 		);
 	}
 
-	public function invalidateStaticMembers(string $className): self
+	public function invalidateStaticMembers(Expr $var): self
 	{
-		if (!$this->reflectionProvider->hasClass($className)) {
-			return $this;
-		}
-
-		$classReflection = $this->reflectionProvider->getClass($className);
-		$classNamesToInvalidate = [strtolower($className)];
-		foreach ($classReflection->getParents() as $parentClass) {
-			$classNamesToInvalidate[] = strtolower($parentClass->getName());
+		$classReflections = $this->getType($var)->getObjectClassReflections();
+		$classNamesToInvalidate = [];
+		foreach ($classReflections as $classReflection) {
+			$classNamesToInvalidate[] = strtolower($classReflection->getName());
+			foreach ($classReflection->getParents() as $parentClass) {
+				$classNamesToInvalidate[] = strtolower($parentClass->getName());
+			}
 		}
 
 		$expressionTypes = $this->expressionTypes;

src/Analyser/NodeScopeResolver.php

@@ -3218,10 +3218,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 					$this->callNodeCallback($nodeCallback, new InvalidateExprNode($normalizedExpr->var), $scope, $storage);
 					$scope = $scope->invalidateExpression($normalizedExpr->var, true, $methodReflection->getDeclaringClass());
 					if ($hasSideEffects) {
-						$classNames = $scope->getType($normalizedExpr->var)->getObjectClassNames();
-						foreach ($classNames as $className) {
-							$scope = $scope->invalidateStaticMembers($className);
-						}
+						$scope = $scope->invalidateStaticMembers($normalizedExpr->var);
 					}
 				}
 				if ($parametersAcceptor !== null && !$methodReflection->isStatic()) {