Catch Throwable from CollectedDataNode rules

Author: ondrejmirtes

phpstan-baseline.neon

@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Method PHPStan\\\\Analyser\\\\AnalyserResultFinalizer\\:\\:finalize\\(\\) throws checked exception Throwable but it's missing from the PHPDoc @throws tag\\.$#"
+			count: 1
+			path: src/Analyser/AnalyserResultFinalizer.php
+
 		-
 			message: "#^Function is_a\\(\\) is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine\\. Use objects retrieved from ReflectionProvider instead\\.$#"
 			count: 1

src/Analyser/AnalyserResultFinalizer.php

@@ -8,8 +8,10 @@
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\Node\CollectedDataNode;
 use PHPStan\Rules\Registry as RuleRegistry;
+use Throwable;
 use function array_merge;
 use function count;
+use function get_class;
 use function sprintf;
 
 class AnalyserResultFinalizer
@@ -25,7 +27,7 @@ public function __construct(
 	{
 	}
 
-	public function finalize(AnalyserResult $analyserResult, bool $onlyFiles): FinalizerResult
+	public function finalize(AnalyserResult $analyserResult, bool $onlyFiles, bool $debug): FinalizerResult
 	{
 		if (count($analyserResult->getCollectedData()) === 0) {
 			return $this->addUnmatchedIgnoredErrors($this->mergeFilteredPhpErrors($analyserResult), [], []);
@@ -42,6 +44,7 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles): Final
 		$file = 'N/A';
 		$scope = $this->scopeFactory->create(ScopeContext::create($file));
 		$tempCollectorErrors = [];
+		$internalErrors = $analyserResult->getInternalErrors();
 		foreach ($this->ruleRegistry->getRules($nodeType) as $rule) {
 			try {
 				$ruleErrors = $rule->processNode($node, $scope);
@@ -69,6 +72,19 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles): Final
 						InternalError::STACK_TRACE_AS_STRING_METADATA_KEY => $e->getTraceAsString(),
 					]);
 				continue;
+			} catch (Throwable $t) {
+				if ($debug) {
+					throw $t;
+				}
+
+				$internalErrors[] = new InternalError(
+					$t->getMessage(),
+					sprintf('running CollectedDataNode rule %s', get_class($rule)),
+					InternalError::prepareTrace($t),
+					$t->getTraceAsString(),
+					true,
+				);
+				continue;
 			}
 
 			foreach ($ruleErrors as $ruleError) {
@@ -110,7 +126,7 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles): Final
 			$locallyIgnoredErrors,
 			$allLinesToIgnore,
 			$allUnmatchedLineIgnores,
-			$analyserResult->getInternalErrors(),
+			$internalErrors,
 			$analyserResult->getCollectedData(),
 			$analyserResult->getDependencies(),
 			$analyserResult->getExportedNodes(),

src/Command/AnalyseApplication.php

@@ -102,7 +102,7 @@ public function analyse(
 			}
 
 			$resultCacheResult = $resultCacheManager->process($intermediateAnalyserResult, $resultCache, $errorOutput, $onlyFiles, true);
-			$analyserResult = $this->analyserResultFinalizer->finalize($resultCacheResult->getAnalyserResult(), $onlyFiles)->getAnalyserResult();
+			$analyserResult = $this->analyserResultFinalizer->finalize($resultCacheResult->getAnalyserResult(), $onlyFiles, $debug)->getAnalyserResult();
 			$internalErrors = $analyserResult->getInternalErrors();
 			$errors = array_merge(
 				$analyserResult->getErrors(),

src/Command/FixerWorkerCommand.php

@@ -231,7 +231,7 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 					false,
 					true,
 				)->getAnalyserResult();
-				$finalizerResult = $analyserResultFinalizer->finalize($analyserResult, $isOnlyFiles);
+				$finalizerResult = $analyserResultFinalizer->finalize($analyserResult, $isOnlyFiles, false);
 
 				$internalErrors = [];
 				foreach ($finalizerResult->getAnalyserResult()->getInternalErrors() as $internalError) {

src/Testing/RuleTestCase.php

@@ -195,7 +195,7 @@ public function gatherAnalyserErrors(array $files): array
 			true,
 		);
 
-		return $finalizer->finalize($analyserResult, false)->getAnalyserResult()->getUnorderedErrors();
+		return $finalizer->finalize($analyserResult, false, true)->getAnalyserResult()->getUnorderedErrors();
 	}
 
 	protected function shouldPolluteScopeWithLoopInitialAssignments(): bool

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1397,6 +1397,7 @@ private function runAnalyse(string $file, ?array $allAnalysedFiles = null): arra
 		$errors = $finalizer->finalize(
 			$analyser->analyse([$file], null, null, true, $allAnalysedFiles),
 			false,
+			true,
 		)->getErrors();
 		foreach ($errors as $error) {
 			$this->assertSame($file, $error->getFilePath());

tests/PHPStan/Analyser/AnalyserTest.php

@@ -685,7 +685,7 @@ private function runAnalyser(
 			new LocalIgnoresProcessor(),
 			$reportUnmatchedIgnoredErrors,
 		);
-		$analyserResult = $finalizer->finalize($analyserResult, $onlyFiles)->getAnalyserResult();
+		$analyserResult = $finalizer->finalize($analyserResult, $onlyFiles, false)->getAnalyserResult();
 
 		$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $normalizedFilePaths, $analyserResult->hasReachedInternalErrorsCountLimit());
 		$errors = $ignoredErrorHelperProcessedResult->getNotIgnoredErrors();