Better fixes

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -3012,13 +3012,10 @@ private function transformStaticType(Type $type): Type
 			if (!$this->isInClass()) {
 				return $type;
 			}
-			if ($type instanceof ThisType) {
-				return $traverse($type);
-			}
 			if ($type instanceof StaticType) {
 				$classReflection = $this->getClassReflection();
 				$changedType = $type->changeBaseClass($classReflection);
-				if ($classReflection->isFinal()) {
+				if ($classReflection->isFinal() && !$type instanceof ThisType) {
 					$changedType = $changedType->getStaticObjectType();
 				}
 				return $traverse($changedType);

src/Analyser/NodeScopeResolver.php

@@ -6157,13 +6157,9 @@ public function getPhpDocs(Scope $scope, Node\FunctionLike|Node\Stmt\Property $n
 	private function transformStaticType(ClassReflection $declaringClass, Type $type): Type
 	{
 		return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($declaringClass): Type {
-			if ($type instanceof ThisType) {
-				return $traverse($type);
-			}
-
 			if ($type instanceof StaticType) {
 				$changedType = $type->changeBaseClass($declaringClass);
-				if ($declaringClass->isFinal()) {
+				if ($declaringClass->isFinal() && !$type instanceof ThisType) {
 					$changedType = $changedType->getStaticObjectType();
 				}
 				return $traverse($changedType);

src/Type/StaticType.php

@@ -299,7 +299,7 @@ private function transformStaticType(Type $type, ClassMemberAccessAnswerer $scop
 					$isFinal = $classReflection->isFinal();
 				}
 				$type = $type->changeBaseClass($classReflection);
-				if (!$isFinal) {
+				if (!$isFinal || $type instanceof ThisType) {
 					return $type;
 				}