Prefix with "Restart" since the "Extension" keyword is ubiquitous in the codebase (#6796)

Author: staabm

bin/phpstan

@@ -29,7 +29,7 @@ use Symfony\Component\Console\Helper\ProgressBar;
 	require_once __DIR__ . '/../src/Turbo/TurboExtensionSelector.php';
 	require_once __DIR__ . '/../src/Process/Restart/RestartReason.php';
 	require_once __DIR__ . '/../src/Process/Restart/OpcacheSettings.php';
-	require_once __DIR__ . '/../src/Process/Restart/ExtensionRegistry.php';
+	require_once __DIR__ . '/../src/Process/Restart/RestartExtensionRegistry.php';
 	require_once __DIR__ . '/../src/Process/Restart/IniComposer.php';
 	require_once __DIR__ . '/../src/Process/Restart/RestartExecutor.php';
 	require_once __DIR__ . '/../src/Process/Restart/RestartManager.php';

src/Command/CommandHelper.php

@@ -31,7 +31,7 @@
 use PHPStan\Internal\DirectoryCreator;
 use PHPStan\Internal\DirectoryCreatorException;
 use PHPStan\Process\ForkedChildCrashReporter;
-use PHPStan\Process\Restart\ExtensionRegistry;
+use PHPStan\Process\Restart\RestartExtensionRegistry;
 use PHPStan\Process\Restart\RestartManager;
 use PHPStan\ShouldNotHappenException;
 use ReflectionClass;
@@ -105,12 +105,12 @@ public static function begin(
 		$errorOutput = new SymfonyOutput($symfonyErrorOutput, new SymfonyStyle(new ErrorsConsoleStyle($input, $symfonyErrorOutput)));
 
 		if ($allowXdebug) {
-			if (!ExtensionRegistry::isXdebugActive()) {
+			if (!RestartExtensionRegistry::isXdebugActive()) {
 				$errorOutput->getStyle()->note('You are running with "--xdebug" enabled, but the Xdebug PHP extension is not active. The process will not halt at breakpoints.');
 			} else {
 				$errorOutput->getStyle()->note("You are running with \"--xdebug\" enabled, and the Xdebug PHP extension is active.\nThe process will halt at breakpoints, but PHPStan will run much slower.\nUse this only if you are debugging PHPStan itself or your custom extensions.");
 			}
-		} elseif (ExtensionRegistry::isXdebugActive()) {
+		} elseif (RestartExtensionRegistry::isXdebugActive()) {
 			$errorOutput->getStyle()->note('The Xdebug PHP extension is active, but "--xdebug" is not used. This may slow down performance and the process will not halt at breakpoints.');
 		} elseif ($debugEnabled && RestartManager::wasRestartedFor('xdebug')) {
 			$errorOutput->getStyle()->note(

src/Process/Restart/RestartDiagnoseExtension.php

@@ -17,7 +17,7 @@ public function print(Output $output): void
 	{
 		$output->writeLineFormatted('<info>Process restart:</info>');
 
-		$detected = ExtensionRegistry::describeDetectedExtensions();
+		$detected = RestartExtensionRegistry::describeDetectedExtensions();
 		$output->writeLineFormatted(sprintf(
 			'Coverage/profilers found:  %s',
 			$detected === [] ? 'none' : implode(', ', $detected),
@@ -44,7 +44,7 @@ private function describeRestartIfStartedNow(): string
 		// the diagnose command does not restart, so it reports the answer an
 		// analyse run started the same way would get. --xdebug is a per-run
 		// option, so it is reported as not given
-		$reasons = ExtensionRegistry::collectReasons(false);
+		$reasons = RestartExtensionRegistry::collectReasons(false);
 		if ($reasons === []) {
 			return 'no, nothing to neutralize or load';
 		}

src/Process/Restart/ExtensionRegistry.php …ess/Restart/RestartExtensionRegistry.phpsrc/Process/Restart/ExtensionRegistry.php renamed to src/Process/Restart/RestartExtensionRegistry.php src/Process/Restart/ExtensionRegistry.php renamed to src/Process/Restart/RestartExtensionRegistry.php

@@ -55,7 +55,7 @@
  * opentelemetry — measured free while merely loaded, and are deliberately
  * absent from every list here.
  */
-final class ExtensionRegistry
+final class RestartExtensionRegistry
 {
 
 	/**

src/Process/Restart/RestartManager.php

@@ -162,7 +162,7 @@ public static function collectReasons(array $argv, ?string $pharPath = null, str
 			return [];
 		}
 
-		return ExtensionRegistry::collectReasons(self::isXdebugAllowed($argv, $appName), $pharPath);
+		return RestartExtensionRegistry::collectReasons(self::isXdebugAllowed($argv, $appName), $pharPath);
 	}
 
 	/**

src/Turbo/TurboDiagnoseExtension.php

@@ -6,7 +6,7 @@
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Diagnose\DiagnoseExtension;
 use PHPStan\Php\PhpVersion;
-use PHPStan\Process\Restart\ExtensionRegistry;
+use PHPStan\Process\Restart\RestartExtensionRegistry;
 use function php_uname;
 use function phpversion;
 use function sprintf;
@@ -88,7 +88,7 @@ private function describeStatus(?string $workerBinary): string
 	{
 		if (!TurboExtensionEnabler::isLoaded()) {
 			if ($workerBinary !== null) {
-				if (ExtensionRegistry::findTurboExtensionToLoad() !== null) {
+				if (RestartExtensionRegistry::findTurboExtensionToLoad() !== null) {
 					return 'not loaded here, loaded by the restart an analyse run performs';
 				}
 

tests/PHPStan/Process/Restart/ExtensionRegistryTest.php

@@ -179,7 +179,7 @@ public function testCollectReasonsFor(
 		array $expectedExtensions,
 	): void
 	{
-		$reasons = ExtensionRegistry::collectReasonsFor($loadedExtensions, $iniSettings, $turboExtensionPath, $allowXdebug);
+		$reasons = RestartExtensionRegistry::collectReasonsFor($loadedExtensions, $iniSettings, $turboExtensionPath, $allowXdebug);
 
 		$this->assertSame(
 			$expectedExtensions,
@@ -191,7 +191,7 @@ public function testXdebugIsFlaggedRatherThanStripped(): void
 	{
 		// stripping would take xdebug_*() out of reflection and so change what
 		// PHPStan knows about code calling them; the flag measures the same
-		$reasons = ExtensionRegistry::collectReasonsFor(['xdebug'], ['xdebug.mode' => 'debug'], null, false);
+		$reasons = RestartExtensionRegistry::collectReasonsFor(['xdebug'], ['xdebug.mode' => 'debug'], null, false);
 
 		$this->assertCount(1, $reasons);
 		$this->assertSame([], $reasons[0]->getStrippedExtensions());
@@ -203,7 +203,7 @@ public function testXdebugIsFlaggedRatherThanStripped(): void
 
 	public function testPcovIsFlaggedRatherThanStripped(): void
 	{
-		$reasons = ExtensionRegistry::collectReasonsFor(['pcov'], ['pcov.enabled' => '1'], null, false);
+		$reasons = RestartExtensionRegistry::collectReasonsFor(['pcov'], ['pcov.enabled' => '1'], null, false);
 
 		$this->assertCount(1, $reasons);
 		$this->assertSame([], $reasons[0]->getStrippedExtensions());
@@ -214,7 +214,7 @@ public function testPcovIsFlaggedRatherThanStripped(): void
 
 	public function testTidewaysIsStrippedRatherThanFlagged(): void
 	{
-		$reasons = ExtensionRegistry::collectReasonsFor(['tideways', 'phpstan_turbo'], [], null, false);
+		$reasons = RestartExtensionRegistry::collectReasonsFor(['tideways', 'phpstan_turbo'], [], null, false);
 
 		$this->assertCount(1, $reasons);
 		$this->assertSame(['tideways'], $reasons[0]->getStrippedExtensions());
@@ -225,7 +225,7 @@ public function testTidewaysIsStrippedRatherThanFlagged(): void
 
 	public function testTurboIsAppendedToTheCommandLineTogetherWithItsMarker(): void
 	{
-		$reasons = ExtensionRegistry::collectReasonsFor([], [], self::TURBO_BINARY, false);
+		$reasons = RestartExtensionRegistry::collectReasonsFor([], [], self::TURBO_BINARY, false);
 
 		$this->assertCount(1, $reasons);
 		$this->assertSame([], $reasons[0]->getStrippedExtensions());
@@ -241,7 +241,7 @@ public function testTurboIsAppendedToTheCommandLineTogetherWithItsMarker(): void
 	public function testOpcacheIsActivatedWhenDormant(): void
 	{
 		$entries = ['opcache.enable_cli=1', 'opcache.jit=disable', 'opcache.file_cache='];
-		$reasons = ExtensionRegistry::collectReasonsFor([], [], null, false, $entries, [
+		$reasons = RestartExtensionRegistry::collectReasonsFor([], [], null, false, $entries, [
 			'opcache.enable_cli' => '',
 			'opcache.jit' => 'disable',
 			'opcache.file_cache' => '',
@@ -260,24 +260,24 @@ public function testOpcacheAlreadyConfiguredIsNotAReason(): void
 	{
 		$entries = ['opcache.enable_cli=1', 'opcache.jit=disable'];
 
-		$this->assertSame([], ExtensionRegistry::collectReasonsFor([], [], null, false, $entries, [
+		$this->assertSame([], RestartExtensionRegistry::collectReasonsFor([], [], null, false, $entries, [
 			'opcache.enable_cli' => '1',
 			'opcache.jit' => 'disable',
 		]));
 		// no entries means OPcache is to be left alone - not loaded, preloading, or not fork-capable
-		$this->assertSame([], ExtensionRegistry::collectReasonsFor([], [], null, false, [], []));
+		$this->assertSame([], RestartExtensionRegistry::collectReasonsFor([], [], null, false, [], []));
 	}
 
 	public function testCollectReasonsDescribesTheCurrentProcess(): void
 	{
 		// the test suite runs with coverage off and without the turbo binary of
 		// a phar installation, so this only asserts that the real-process entry
 		// point agrees with what the process actually has loaded
-		foreach (ExtensionRegistry::collectReasons(false) as $reason) {
+		foreach (RestartExtensionRegistry::collectReasons(false) as $reason) {
 			$this->assertContains($reason->getExtension(), ['xdebug', 'pcov', 'uopz', 'phpstan_turbo', 'tideways', 'opcache']);
 		}
 
-		$this->assertSame([], ExtensionRegistry::collectReasonsFor([], [], null, false));
+		$this->assertSame([], RestartExtensionRegistry::collectReasonsFor([], [], null, false));
 	}
 
 	public function testIsXdebugActiveRequiresTheExtension(): void
@@ -286,8 +286,8 @@ public function testIsXdebugActiveRequiresTheExtension(): void
 			$this->markTestSkipped('xdebug is loaded in this process.');
 		}
 
-		$this->assertFalse(ExtensionRegistry::isXdebugActive());
-		foreach (ExtensionRegistry::describeDetectedExtensions() as $description) {
+		$this->assertFalse(RestartExtensionRegistry::isXdebugActive());
+		foreach (RestartExtensionRegistry::describeDetectedExtensions() as $description) {
 			$this->assertStringNotContainsString('xdebug', $description);
 		}
 	}