Do not rely on registered exception handler when debugging

phpstan · Jul 29, 2021 · 48ec184 · 48ec184
1 parent 0471f87
commit 48ec184
Showing 1 changed file with 30 additions and 11 deletions.
diff --git a/src/Command/AnalyseCommand.php b/src/Command/AnalyseCommand.php
@@ -224,17 +224,36 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			throw new \PHPStan\ShouldNotHappenException();
 		}
 
-		$analysisResult = $application->analyse(
-			$files,
-			$onlyFiles,
-			$inceptionResult->getStdOutput(),
-			$inceptionResult->getErrorOutput(),
-			$inceptionResult->isDefaultLevelUsed(),
-			$debug,
-			$inceptionResult->getProjectConfigFile(),
-			$inceptionResult->getProjectConfigArray(),
-			$input
-		);
+		try {
+			$analysisResult = $application->analyse(
+				$files,
+				$onlyFiles,
+				$inceptionResult->getStdOutput(),
+				$inceptionResult->getErrorOutput(),
+				$inceptionResult->isDefaultLevelUsed(),
+				$debug,
+				$inceptionResult->getProjectConfigFile(),
+				$inceptionResult->getProjectConfigArray(),
+				$input
+			);
+		} catch (\Throwable $t) {
+			if ($debug) {
+				$inceptionResult->getStdOutput()->writeRaw(sprintf(
+					'Uncaught %s: %s in %s:%d',
+					get_class($t),
+					$t->getMessage(),
+					$t->getFile(),
+					$t->getLine()
+				));
+				$inceptionResult->getStdOutput()->writeLineFormatted('');
+				$inceptionResult->getStdOutput()->writeRaw($t->getTraceAsString());
+				$inceptionResult->getStdOutput()->writeLineFormatted('');
+
+				return $inceptionResult->handleReturn(1);
+			}
+
+			throw $t;
+		}
 
 		if ($generateBaselineFile !== null) {
 			if (!$analysisResult->hasErrors()) {