Move container re-registration into PHPStanTestCase behind an opt-in flag

Replace the per-class setUp() duplication with a $reinitializeContainerBeforeEachTest
flag (default false) on PHPStanTestCase. Tests with PHP-version-dependent reflection
assertions opt in by setting it to true, so the runtime container is pinned before each
test without each class re-implementing setUp().

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: phpstan-bot

src/Testing/PHPStanTestCase.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Testing;
 
+use Override;
 use PHPStan\Analyser\ConstantResolver;
 use PHPStan\Analyser\DirectInternalScopeFactoryFactory;
 use PHPStan\Analyser\Error;
@@ -40,6 +41,24 @@ abstract class PHPStanTestCase extends TestCase
 
 	use PHPStanTestCaseTrait;
 
+	/**
+	 * Re-register the runtime container as the global static reflection provider before
+	 * every test. Enable this in tests that construct Type objects directly and assert
+	 * PHP-version-dependent reflection results, so a foreign PhpVersion leaked by another
+	 * test can't flake them. See https://github.com/phpstan/phpstan/issues/14860
+	 */
+	protected bool $reinitializeContainerBeforeEachTest = false;
+
+	#[Override]
+	protected function setUp(): void
+	{
+		if (!$this->reinitializeContainerBeforeEachTest) {
+			return;
+		}
+
+		self::getContainer();
+	}
+
 	public static function getParser(): Parser
 	{
 		/** @var Parser $parser */

tests/PHPStan/Type/Accessory/HasPropertyTypeTest.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use DateInterval;
-use Override;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CallableType;
@@ -24,14 +23,10 @@
 class HasPropertyTypeTest extends PHPStanTestCase
 {
 
-	#[Override]
-	protected function setUp(): void
-	{
-		// Pin the runtime container so a foreign PhpVersion leaked by another test
-		// can't flake the version-dependent Closure data set below.
-		// See https://github.com/phpstan/phpstan/issues/14860
-		self::getContainer();
-	}
+	// Pin the runtime container so a foreign PhpVersion leaked by another test
+	// can't flake the version-dependent Closure data set below.
+	// See https://github.com/phpstan/phpstan/issues/14860
+	protected bool $reinitializeContainerBeforeEachTest = true;
 
 	public static function dataIsSuperTypeOf(): array
 	{

tests/PHPStan/Type/Generic/GenericObjectTypeTest.php

@@ -6,7 +6,6 @@
 use DateTimeInterface;
 use Exception;
 use Iterator;
-use Override;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\IntegerType;
@@ -33,14 +32,10 @@
 class GenericObjectTypeTest extends PHPStanTestCase
 {
 
-	#[Override]
-	protected function setUp(): void
-	{
-		// Pin the runtime container so a foreign PhpVersion leaked by another test
-		// can't flake the version-dependent data sets (reflected variance of built-in
-		// generics). See https://github.com/phpstan/phpstan/issues/14860
-		self::getContainer();
-	}
+	// Pin the runtime container so a foreign PhpVersion leaked by another test
+	// can't flake the version-dependent data sets (reflected variance of built-in
+	// generics). See https://github.com/phpstan/phpstan/issues/14860
+	protected bool $reinitializeContainerBeforeEachTest = true;
 
 	public static function dataIsSuperTypeOf(): array
 	{

tests/PHPStan/Type/ObjectTypeTest.php

@@ -23,7 +23,6 @@
 use Iterator;
 use LogicException;
 use ObjectTypeEnums\FooEnum;
-use Override;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\HasMethodType;
@@ -52,14 +51,10 @@
 class ObjectTypeTest extends PHPStanTestCase
 {
 
-	#[Override]
-	protected function setUp(): void
-	{
-		// Pin the runtime container so a foreign PhpVersion leaked by another test
-		// can't flake the version-dependent Closure data sets (dynamic-property
-		// handling). See https://github.com/phpstan/phpstan/issues/14860
-		self::getContainer();
-	}
+	// Pin the runtime container so a foreign PhpVersion leaked by another test
+	// can't flake the version-dependent Closure data sets (dynamic-property
+	// handling). See https://github.com/phpstan/phpstan/issues/14860
+	protected bool $reinitializeContainerBeforeEachTest = true;
 
 	public static function dataIsIterable(): array
 	{

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -14,7 +14,6 @@
 use InvalidArgumentException;
 use Iterator;
 use ObjectShapesAcceptance\ClassWithFooIntProperty;
-use Override;
 use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\Fixture\FinalClass;
 use PHPStan\Generics\FunctionsAssertType\C;
@@ -74,14 +73,10 @@
 class TypeCombinatorTest extends PHPStanTestCase
 {
 
-	#[Override]
-	protected function setUp(): void
-	{
-		// Pin the runtime container so a foreign PhpVersion leaked by another test
-		// can't flake the version-dependent data sets (dynamic-property handling of
-		// final classes). See https://github.com/phpstan/phpstan/issues/14860
-		self::getContainer();
-	}
+	// Pin the runtime container so a foreign PhpVersion leaked by another test
+	// can't flake the version-dependent data sets (dynamic-property handling of
+	// final classes). See https://github.com/phpstan/phpstan/issues/14860
+	protected bool $reinitializeContainerBeforeEachTest = true;
 
 	public static function dataAddNull(): array
 	{