Revert "Fix various issues with final-overriden class assumptions"

This reverts commit 7848b38.

Author: ondrejmirtes

Diff for: phpstan-baseline.neon

@@ -1419,7 +1419,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 2
+			count: 3
 			path: src/Type/ObjectType.php
 
 		-

Diff for: src/Type/ObjectType.php

@@ -182,7 +182,7 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 		} else {
 			$canAccessProperty = $scope->getClassReflection()->getName();
 		}
-		$description = $this->describe(VerbosityLevel::cache());
+		$description = $this->describeCache();
 
 		if (isset(self::$properties[$description][$propertyName][$canAccessProperty])) {
 			return self::$properties[$description][$propertyName][$canAccessProperty];
@@ -321,8 +321,14 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 			return IsSuperTypeOfResult::createNo();
 		}
 
-		$thisDescription = $this->describe(VerbosityLevel::cache());
-		$description = $type->describe(VerbosityLevel::cache());
+		$thisDescription = $this->describeCache();
+
+		if ($type instanceof self) {
+			$description = $type->describeCache();
+		} else {
+			$description = $type->describe(VerbosityLevel::cache());
+		}
+
 		if (isset(self::$superTypes[$thisDescription][$description])) {
 			return self::$superTypes[$thisDescription][$description];
 		}
@@ -510,33 +516,15 @@ public function describe(VerbosityLevel $level): string
 			$preciseNameCallback,
 			$preciseWithSubtracted,
 			function () use ($preciseWithSubtracted): string {
-				if ($this->cachedDescription !== null) {
-					return $this->cachedDescription;
-				}
-
-				$description = $preciseWithSubtracted();
-
-				if ($this instanceof GenericObjectType) {
-					$description .= '<';
-					$typeDescriptions = [];
-					foreach ($this->getTypes() as $type) {
-						$typeDescriptions[] = $type->describe(VerbosityLevel::cache());
-					}
-					$description .= '<' . implode(', ', $typeDescriptions) . '>';
-				}
-
 				$reflection = $this->classReflection;
+				$line = '';
 				if ($reflection !== null) {
-					$description .= '-';
-					$description .= (string) $reflection->getNativeReflection()->getStartLine();
-					$description .= '-';
-
-					if ($reflection->hasFinalByKeywordOverride()) {
-						$description .= 'f=' . ($reflection->isFinalByKeyword() ? 't' : 'f');
-					}
+					$line .= '-';
+					$line .= (string) $reflection->getNativeReflection()->getStartLine();
+					$line .= '-';
 				}
 
-				return $this->cachedDescription = $description . $this->describeAdditionalCacheKey();
+				return $preciseWithSubtracted() . '-' . static::class . '-' . $line . $this->describeAdditionalCacheKey();
 			},
 		);
 	}
@@ -546,6 +534,47 @@ protected function describeAdditionalCacheKey(): string
 		return '';
 	}
 
+	private function describeCache(): string
+	{
+		if ($this->cachedDescription !== null) {
+			return $this->cachedDescription;
+		}
+
+		if (static::class !== self::class) {
+			return $this->cachedDescription = $this->describe(VerbosityLevel::cache());
+		}
+
+		$description = $this->className;
+
+		if ($this instanceof GenericObjectType) {
+			$description .= '<';
+			$typeDescriptions = [];
+			foreach ($this->getTypes() as $type) {
+				$typeDescriptions[] = $type->describe(VerbosityLevel::cache());
+			}
+			$description .= '<' . implode(', ', $typeDescriptions) . '>';
+		}
+
+		if ($this->subtractedType !== null) {
+			$description .= $this->subtractedType instanceof UnionType
+				? sprintf('~(%s)', $this->subtractedType->describe(VerbosityLevel::cache()))
+				: sprintf('~%s', $this->subtractedType->describe(VerbosityLevel::cache()));
+		}
+
+		$reflection = $this->classReflection;
+		if ($reflection !== null) {
+			$description .= '-';
+			$description .= (string) $reflection->getNativeReflection()->getStartLine();
+			$description .= '-';
+
+			if ($reflection->hasFinalByKeywordOverride()) {
+				$description .= 'f=' . ($reflection->isFinalByKeyword() ? 't' : 'f');
+			}
+		}
+
+		return $this->cachedDescription = $description;
+	}
+
 	public function toNumber(): Type
 	{
 		if ($this->isInstanceOf('SimpleXMLElement')->yes()) {
@@ -748,7 +777,7 @@ public function getUnresolvedMethodPrototype(string $methodName, ClassMemberAcce
 		} else {
 			$canCallMethod = $scope->getClassReflection()->getName();
 		}
-		$description = $this->describe(VerbosityLevel::cache());
+		$description = $this->describeCache();
 		if (isset(self::$methods[$description][$methodName][$canCallMethod])) {
 			return self::$methods[$description][$methodName][$canCallMethod];
 		}
@@ -1237,7 +1266,7 @@ public function getEnumCases(): array
 			return [];
 		}
 
-		$cacheKey = $this->describe(VerbosityLevel::cache());
+		$cacheKey = $this->describeCache();
 		if (array_key_exists($cacheKey, self::$enumCases)) {
 			return self::$enumCases[$cacheKey];
 		}
@@ -1500,7 +1529,7 @@ public function getAncestorWithClassName(string $className): ?self
 			return $this->currentAncestors[$className];
 		}
 
-		$description = $this->describe(VerbosityLevel::cache());
+		$description = $this->describeCache();
 		if (
 			array_key_exists($description, self::$ancestors)
 			&& array_key_exists($className, self::$ancestors[$description])