Init container also for tests without dataprovider

Author: staabm

src/Testing/PHPUnit/ContainerInitializer.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Testing\PHPUnit;
+
+use PHPStan\DependencyInjection\InvalidIgnoredErrorExceptionTest;
+
+final class ContainerInitializer
+{
+
+	public static function initialize(string $testClassName): void
+	{
+		// This test expects an exception during container initialization
+		if ($testClassName === InvalidIgnoredErrorExceptionTest::class) {
+			return;
+		}
+
+		$testClassName::getContainer();
+	}
+
+}

src/Testing/PHPUnit/InitContainerBeforeDataProviderSubscriber.php

@@ -20,7 +20,7 @@ public function notify(DataProviderMethodCalled $event): void
 			return;
 		}
 
-		$testClassName::getContainer();
+		ContainerInitializer::initialize($testClassName);
 	}
 
 }

src/Testing/PHPUnit/InitContainerBeforeTestSubscriber.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Testing\PHPUnit;
+
+use Override;
+use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Event\Test\PreparationStarted;
+use PHPUnit\Event\Test\PreparationStartedSubscriber;
+use function is_a;
+
+final class InitContainerBeforeTestSubscriber implements PreparationStartedSubscriber
+{
+
+	#[Override]
+	public function notify(PreparationStarted $event): void
+	{
+		$test = $event->test();
+		if (!$test->isTestMethod()) {
+			// skip PHPT tests
+			return;
+		}
+
+		$testClassName = $test->className();
+
+		if (!is_a($testClassName, PhpStanTestCase::class, true)) {
+			return;
+		}
+
+		ContainerInitializer::initialize($testClassName);
+	}
+
+}

src/Testing/PHPUnit/PHPStanPHPUnitExtension.php

@@ -21,6 +21,9 @@ public function bootstrap(
 		$facade->registerSubscriber(
 			new InitContainerBeforeDataProviderSubscriber(),
 		);
+		$facade->registerSubscriber(
+			new InitContainerBeforeTestSubscriber(),
+		);
 	}
 
 }