Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Jul 14, 2024 · 87d2bec · 87d2bec
2 parents c1e2e96 + 76464ee
commit 87d2bec
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/conf/config.neon b/conf/config.neon
@@ -2106,6 +2106,8 @@ services:
 
 	phpstanDiagnoseExtension:
 		class: PHPStan\Diagnose\PHPStanDiagnoseExtension
+		arguments:
+			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
 		autowired: false
 
 	# Error formatters

diff --git a/src/Diagnose/PHPStanDiagnoseExtension.php b/src/Diagnose/PHPStanDiagnoseExtension.php
@@ -2,19 +2,28 @@
 
 namespace PHPStan\Diagnose;
 
+use Phar;
 use PHPStan\Command\Output;
 use PHPStan\ExtensionInstaller\GeneratedConfig;
 use PHPStan\Internal\ComposerHelper;
 use PHPStan\Php\PhpVersion;
 use function class_exists;
 use function count;
+use function dirname;
+use function is_file;
 use function sprintf;
 use const PHP_VERSION_ID;
 
 class PHPStanDiagnoseExtension implements DiagnoseExtension
 {
 
-	public function __construct(private PhpVersion $phpVersion)
+	/**
+	 * @param string[] $composerAutoloaderProjectPaths
+	 */
+	public function __construct(
+		private PhpVersion $phpVersion,
+		private array $composerAutoloaderProjectPaths,
+	)
 	{
 	}
 
@@ -30,11 +39,25 @@ public function print(Output $output): void
 			$this->phpVersion->getVersionString(),
 			$this->phpVersion->getSourceLabel(),
 		));
+		$output->writeLineFormatted('');
+
 		$output->writeLineFormatted(sprintf(
 			'<info>PHPStan version:</info> %s',
 			ComposerHelper::getPhpStanVersion(),
 		));
+		$output->writeLineFormatted('<info>PHPStan running from:</info>');
+		$pharRunning = Phar::running(false);
+		if ($pharRunning !== '') {
+			$output->writeLineFormatted(dirname($pharRunning));
+		} else {
+			if (isset($_SERVER['argv'][0]) && is_file($_SERVER['argv'][0])) {
+				$output->writeLineFormatted($_SERVER['argv'][0]);
+			} else {
+				$output->writeLineFormatted('Unknown');
+			}
+		}
 		$output->writeLineFormatted('');
+
 		if (class_exists('PHPStan\ExtensionInstaller\GeneratedConfig')) {
 			$output->writeLineFormatted('<info>Extension installer:</info>');
 			if (count(GeneratedConfig::EXTENSIONS) === 0) {
@@ -47,6 +70,12 @@ public function print(Output $output): void
 			$output->writeLineFormatted('<info>Extension installer:</info> Not installed');
 		}
 		$output->writeLineFormatted('');
+
+		$output->writeLineFormatted('<info>Discovered Composer project roots:</info>');
+		foreach ($this->composerAutoloaderProjectPaths as $composerAutoloaderProjectPath) {
+			$output->writeLineFormatted($composerAutoloaderProjectPath);
+		}
+		$output->writeLineFormatted('');
 	}
 
 }