Do not identify the last initialized container by its spl_object_id()

An id is recycled as soon as its object is freed, so a container created after an
earlier one was destroyed can inherit that one's id - and postInitializeContainer()
would then return early and leave the static reflection provider, the PhpVersion
and the feature toggles pointing at the container that is gone. Hold a
WeakReference and compare identities instead.

ExprHandlerRegistry and StmtHandlerRegistry memoize handler instances under the
same recycled id, and a handler carries its own container's services and
parameters, so both memos are dropped whenever another container takes over.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019isZYNh3Zms6xGKGGXqxgp

Author: ondrejmirtes

src/Analyser/ExprHandlerRegistry.php

@@ -18,6 +18,18 @@ final class ExprHandlerRegistry
 	/** @var array<int, array<non-empty-string, ExprHandler<Expr>|false>> */
 	private static array $exprHandlersByClass = [];
 
+	/**
+	 * Handlers belong to the container they came from, and spl_object_id() is
+	 * recycled as soon as a container is freed - so ContainerFactory drops the
+	 * memo whenever another container takes over the global state.
+	 *
+	 * @internal
+	 */
+	public static function clearCache(): void
+	{
+		self::$exprHandlersByClass = [];
+	}
+
 	/**
 	 * @return ExprHandler<Expr>|null
 	 */

src/Analyser/StmtHandlerRegistry.php

@@ -23,6 +23,15 @@ final class StmtHandlerRegistry
 	/** @var array<int, array<class-string<Stmt>, StmtHandler<Stmt>|false>> */
 	private static array $stmtHandlersByClass = [];
 
+	/**
+	 * @see ExprHandlerRegistry::clearCache()
+	 * @internal
+	 */
+	public static function clearCache(): void
+	{
+		self::$stmtHandlersByClass = [];
+	}
+
 	/**
 	 * @return StmtHandler<Stmt>|null
 	 */

src/DependencyInjection/ContainerFactory.php

@@ -17,6 +17,8 @@
 use Nette\Utils\Validators;
 use Phar;
 use PhpParser\Parser;
+use PHPStan\Analyser\ExprHandlerRegistry;
+use PHPStan\Analyser\StmtHandlerRegistry;
 use PHPStan\BetterReflection\BetterReflection;
 use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
@@ -32,6 +34,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TypeCombinator;
+use WeakReference;
 use function array_diff_key;
 use function array_intersect;
 use function array_key_exists;
@@ -49,7 +52,6 @@
 use function is_file;
 use function is_readable;
 use function is_string;
-use function spl_object_id;
 use function sprintf;
 use function str_ends_with;
 use function substr;
@@ -66,7 +68,8 @@ final class ContainerFactory
 
 	private string $configDirectory;
 
-	private static ?int $lastInitializedContainerId = null;
+	/** @var WeakReference<Container>|null */
+	private static ?WeakReference $lastInitializedContainer = null;
 
 	private bool $journalContainer = false;
 
@@ -172,12 +175,22 @@ public function create(
 	/** @internal */
 	public static function postInitializeContainer(Container $container): void
 	{
-		$containerId = spl_object_id($container);
-		if ($containerId === self::$lastInitializedContainerId) {
+		// Comparing spl_object_id()s would be wrong: an id is recycled as soon as its
+		// container is freed, so a fresh container could inherit the last initialized
+		// one's id and silently skip installing its own global state.
+		$lastInitializedContainer = self::$lastInitializedContainer !== null ? self::$lastInitializedContainer->get() : null;
+		if ($lastInitializedContainer === $container) {
 			return;
 		}
 
-		self::$lastInitializedContainerId = $containerId;
+		self::$lastInitializedContainer = WeakReference::create($container);
+
+		// Both registries memoize handler instances per container, keyed by the
+		// container's spl_object_id() - a recycled id would otherwise hand this
+		// container the freed one's handlers, which carry the other container's
+		// services and parameters.
+		ExprHandlerRegistry::clearCache();
+		StmtHandlerRegistry::clearCache();
 
 		/** @var SourceLocator $sourceLocator */
 		$sourceLocator = $container->getService('betterReflectionSourceLocator');