Call ObjectType::resetCaches() in more cases

Author: ondrejmirtes

src/DependencyInjection/ContainerFactory.php

@@ -30,6 +30,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\ObjectType;
 use function array_diff_key;
 use function array_intersect;
 use function array_key_exists;
@@ -194,6 +195,7 @@ public static function postInitializeContainer(Container $container): void
 
 		ReflectionProviderStaticAccessor::registerInstance($container->getByType(ReflectionProvider::class));
 		PhpVersionStaticAccessor::registerInstance($container->getByType(PhpVersion::class));
+		ObjectType::resetCaches();
 		$container->getService('typeSpecifier');
 
 		BleedingEdgeToggle::setBleedingEdge($container->getParameter('featureToggles')['bleedingEdge']);

src/DependencyInjection/ValidateIgnoredErrorsExtension.php

@@ -31,6 +31,7 @@
 use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\Type\Constant\OversizedArrayBuilder;
 use PHPStan\Type\DirectTypeAliasResolverProvider;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\OperatorTypeSpecifyingExtensionRegistry;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeAliasResolver;
@@ -203,6 +204,7 @@ public function getRegistry(): OperatorTypeSpecifyingExtensionRegistry
 			if ($originalPhpVersion !== null) {
 				PhpVersionStaticAccessor::registerInstance($originalPhpVersion);
 			}
+			ObjectType::resetCaches();
 		}
 	}
 

src/PhpDoc/StubValidator.php

@@ -97,6 +97,7 @@
 use PHPStan\Rules\Properties\MissingPropertyTypehintRule;
 use PHPStan\Rules\Registry as RuleRegistry;
 use PHPStan\Type\FileTypeMapper;
+use PHPStan\Type\ObjectType;
 use Throwable;
 use function array_fill_keys;
 use function count;
@@ -174,6 +175,7 @@ static function (): void {
 		} finally {
 			ReflectionProviderStaticAccessor::registerInstance($originalReflectionProvider);
 			PhpVersionStaticAccessor::registerInstance($originalPhpVersion);
+			ObjectType::resetCaches();
 		}
 
 		return $errors;

src/Reflection/ReflectionProviderStaticAccessor.php

@@ -2,8 +2,6 @@
 
 namespace PHPStan\Reflection;
 
-use PHPStan\Type\ObjectType;
-
 final class ReflectionProviderStaticAccessor
 {
 
@@ -16,7 +14,6 @@ private function __construct()
 	public static function registerInstance(ReflectionProvider $reflectionProvider): void
 	{
 		self::$instance = $reflectionProvider;
-		ObjectType::resetCaches();
 	}
 
 	public static function getInstance(): ReflectionProvider