PHPStan Pro - present all errors with non-ignorable exceptions as int…

…ernal errors
phpstan · Jun 17, 2024 · 7d9800c · 7d9800c
1 parent 108277a
commit 7d9800c
Showing 1 changed file with 37 additions and 16 deletions.
diff --git a/src/Command/FixerWorkerCommand.php b/src/Command/FixerWorkerCommand.php
@@ -210,6 +210,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$configuration,
 				$input,
 				function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use ($out, $ignoredErrorHelperResult, $isOnlyFiles, $inceptionFiles): void {
+					$internalErrors = [];
+					foreach ($errors as $fileSpecificError) {
+						if (!$fileSpecificError->hasNonIgnorableException()) {
+							continue;
+						}
+
+						$internalErrors[] = $this->transformErrorIntoInternalError($fileSpecificError);
+					}
+
+					if (count($internalErrors) > 0) {
+						$out->write(['action' => 'analysisCrash', 'data' => [
+							'internalErrors' => $internalErrors,
+						]]);
+						return;
+					}
+
 					[$errors, $ignoredErrors] = $this->filterErrors($errors, $ignoredErrorHelperResult, $isOnlyFiles, $inceptionFiles, false);
 					foreach ($locallyIgnoredErrors as $locallyIgnoredError) {
 						$ignoredErrors[] = [$locallyIgnoredError, null];
@@ -249,22 +265,7 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 						continue;
 					}
 
-					$message = $fileSpecificError->getMessage();
-					$metadata = $fileSpecificError->getMetadata();
-					if (
-						$fileSpecificError->getIdentifier() === 'phpstan.internal'
-						&& array_key_exists(InternalError::STACK_TRACE_AS_STRING_METADATA_KEY, $metadata)
-					) {
-						$message = sprintf('Internal error: %s', $message);
-					}
-
-					$internalErrors[] = new InternalError(
-						$message,
-						sprintf('analysing file %s', $fileSpecificError->getTraitFilePath() ?? $fileSpecificError->getFilePath()),
-						$metadata[InternalError::STACK_TRACE_METADATA_KEY] ?? [],
-						$metadata[InternalError::STACK_TRACE_AS_STRING_METADATA_KEY] ?? null,
-						true,
-					);
+					$internalErrors[] = $this->transformErrorIntoInternalError($fileSpecificError);
 				}
 
 				$hasInternalErrors = count($internalErrors) > 0 || $finalizerResult->getAnalyserResult()->hasReachedInternalErrorsCountLimit();
@@ -327,6 +328,26 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 		return 0;
 	}
 
+	private function transformErrorIntoInternalError(Error $error): InternalError
+	{
+		$message = $error->getMessage();
+		$metadata = $error->getMetadata();
+		if (
+			$error->getIdentifier() === 'phpstan.internal'
+			&& array_key_exists(InternalError::STACK_TRACE_AS_STRING_METADATA_KEY, $metadata)
+		) {
+			$message = sprintf('Internal error: %s', $message);
+		}
+
+		return new InternalError(
+			$message,
+			sprintf('analysing file %s', $error->getTraitFilePath() ?? $error->getFilePath()),
+			$metadata[InternalError::STACK_TRACE_METADATA_KEY] ?? [],
+			$metadata[InternalError::STACK_TRACE_AS_STRING_METADATA_KEY] ?? null,
+			true,
+		);
+	}
+
 	/**
 	 * @param string[] $inceptionFiles
 	 * @param array<Error> $errors