Rework exactInstantiation a bit

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -1690,7 +1690,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 			);
 		} elseif ($node instanceof New_) {
 			if ($node->class instanceof Name) {
-				$type = $this->exactInstantiation($node, $node->class->toString());
+				$type = $this->exactInstantiation($node, $node->class);
 				if ($type !== null) {
 					return $type;
 				}
@@ -2778,30 +2778,6 @@ private function getTypeFromArrayDimFetch(
 		return $offsetAccessibleType->getOffsetValueType($offsetType);
 	}
 
-	private function resolveExactName(string $name): ?string
-	{
-		switch (strtolower($name)) {
-			case 'self':
-				if (!$this->isInClass()) {
-					return null;
-				}
-				return $this->getClassReflection()->getName();
-			case 'parent':
-				if (!$this->isInClass()) {
-					return null;
-				}
-				$currentClassReflection = $this->getClassReflection();
-				if ($currentClassReflection->getParentClass() !== null) {
-					return $currentClassReflection->getParentClass()->getName();
-				}
-				return null;
-			case 'static':
-				return null;
-		}
-
-		return $name;
-	}
-
 	/** @api */
 	public function resolveName(Name $name): string
 	{
@@ -5814,22 +5790,11 @@ public function debug(): array
 		return $descriptions;
 	}
 
-	/**
-	 * @param non-empty-string $className
-	 */
-	private function exactInstantiation(New_ $node, string $className): ?Type
+	private function exactInstantiation(New_ $node, Name $className): ?Type
 	{
-		$resolvedClassName = $this->resolveExactName($className);
+		$resolvedClassName = $this->resolveName($className);
 		$isStatic = false;
-		if ($resolvedClassName === null) {
-			if (strtolower($className) !== 'static') {
-				return null;
-			}
-
-			if (!$this->isInClass()) {
-				return null;
-			}
-			$resolvedClassName = $this->getClassReflection()->getName();
+		if ($className->toLowerString() === 'static') {
 			$isStatic = true;
 		}