Do not always ask to report bug about an internal error

src/Analyser/InternalError.php

@@ -26,6 +26,7 @@ public function __construct(
 		private string $contextDescription,
 		private array $trace,
 		private ?string $traceAsString,
+		private bool $shouldReportBug,
 	)
 	{
 	}
@@ -71,12 +72,17 @@ public function getTraceAsString(): ?string
 		return $this->traceAsString;
 	}
 
+	public function shouldReportBug(): bool
+	{
+		return $this->shouldReportBug;
+	}
+
 	/**
 	 * @param mixed[] $json
 	 */
 	public static function decode(array $json): self
 	{
-		return new self($json['message'], $json['contextDescription'], $json['trace'], $json['traceAsString']);
+		return new self($json['message'], $json['contextDescription'], $json['trace'], $json['traceAsString'], $json['shouldReportBug']);
 	}
 
 	/**
@@ -90,6 +96,7 @@ public function jsonSerialize()
 			'contextDescription' => $this->contextDescription,
 			'trace' => $this->trace,
 			'traceAsString' => $this->traceAsString,
+			'shouldReportBug' => $this->shouldReportBug,
 		];
 	}
 

src/Command/AnalyseCommand.php

@@ -29,6 +29,7 @@
 use Symfony\Component\Console\Output\StreamOutput;
 use Throwable;
 use function array_intersect;
+use function array_key_exists;
 use function array_keys;
 use function array_map;
 use function array_unique;
@@ -332,10 +333,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$internalErrors = [];
 		foreach ($analysisResult->getInternalErrorObjects() as $internalError) {
 			$internalErrors[$internalError->getMessage()] = new InternalError(
-				sprintf('Internal error: %s', $internalError->getMessage()),
+				$internalError->getTraceAsString() !== null ? sprintf('Internal error: %s', $internalError->getMessage()) : $internalError->getMessage(),
 				$internalError->getContextDescription(),
 				$internalError->getTrace(),
 				$internalError->getTraceAsString(),
+				$internalError->shouldReportBug(),
 			);
 		}
 		foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
@@ -344,39 +346,56 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			}
 
 			$message = $fileSpecificError->getMessage();
-			if ($fileSpecificError->getIdentifier() === 'phpstan.internal') {
+			$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);
 			}
 
-			$metadata = $fileSpecificError->getMetadata();
 			$internalErrors[$fileSpecificError->getMessage()] = 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 = array_values($internalErrors);
 		$bugReportUrl = 'https://github.com/phpstan/phpstan/issues/new?template=Bug_report.yaml';
 		foreach ($internalErrors as $i => $internalError) {
 			$message = sprintf('%s while %s', $internalError->getMessage(), $internalError->getContextDescription());
-			if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$firstTraceItem = $internalError->getTrace()[0] ?? null;
-				$trace = '';
-				if ($firstTraceItem !== null && $firstTraceItem['file'] !== null && $firstTraceItem['line'] !== null) {
-					$trace = sprintf('## %s(%d)%s', $firstTraceItem['file'], $firstTraceItem['line'], "\n");
+			if ($internalError->getTraceAsString() !== null) {
+				if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+					$firstTraceItem = $internalError->getTrace()[0] ?? null;
+					$trace = '';
+					if ($firstTraceItem !== null && $firstTraceItem['file'] !== null && $firstTraceItem['line'] !== null) {
+						$trace = sprintf('## %s(%d)%s', $firstTraceItem['file'], $firstTraceItem['line'], "\n");
+					}
+					$trace .= $internalError->getTraceAsString();
+
+					if ($internalError->shouldReportBug()) {
+						$message .= sprintf('%sPost the following stack trace to %s: %s%s', "\n", $bugReportUrl, "\n", $trace);
+					} else {
+						$message .= sprintf('%s%s', "\n\n", $trace);
+					}
+				} else {
+					if ($internalError->shouldReportBug()) {
+						$message .= sprintf('%sRun PHPStan with -v option and post the stack trace to:%s%s%s', "\n\n", "\n", $bugReportUrl, "\n");
+					} else {
+						$message .= sprintf('%sRun PHPStan with -v option to see the stack trace', "\n");
+					}
 				}
-				$trace .= $internalError->getTraceAsString();
-				$message .= sprintf('%sPost the following stack trace to %s: %s%s', "\n\n", $bugReportUrl, "\n", $trace);
-			} else {
-				$message .= sprintf('%sRun PHPStan with -v option and post the stack trace to:%s%s', "\n", "\n", $bugReportUrl);
 			}
+
 			$internalErrors[$i] = new InternalError(
 				$message,
 				$internalError->getContextDescription(),
 				$internalError->getTrace(),
 				$internalError->getTraceAsString(),
+				$internalError->shouldReportBug(),
 			);
 		}
 

src/Command/FixerApplication.php

@@ -485,6 +485,7 @@ private function analyse(
 					'running PHPStan Pro worker',
 					InternalError::prepareTrace($e),
 					$e->getTraceAsString(),
+					false,
 				)],
 			]]);
 			throw $e;

src/Command/FixerWorkerCommand.php

@@ -242,6 +242,7 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 								'running analyser in PHPStan Pro worker',
 								[],
 								null,
+								false,
 							),
 						],
 					]]);

src/Command/WorkerCommand.php

@@ -170,6 +170,7 @@ private function runWorker(
 							'communicating with main process in parallel worker',
 							InternalError::prepareTrace($error),
 							$error->getTraceAsString(),
+							true,
 						),
 					],
 					'filteredPhpErrors' => [],
@@ -235,6 +236,7 @@ private function runWorker(
 						sprintf('analysing file %s', $file),
 						InternalError::prepareTrace($t),
 						$t->getTraceAsString(),
+						true,
 					);
 				}
 			}

src/Parallel/ParallelAnalyser.php

@@ -95,6 +95,7 @@ public function analyse(
 					'running parallel worker',
 					[],
 					null,
+					true,
 				);
 				$internalErrorsCount++;
 			}
@@ -149,6 +150,7 @@ public function analyse(
 				'communicating with parallel worker',
 				InternalError::prepareTrace($error),
 				$error->getTraceAsString(),
+				!$error instanceof ProcessTimedOutException,
 			);
 			$internalErrorsCount++;
 			$reachedInternalErrorsCountLimit = true;
@@ -299,7 +301,7 @@ public function analyse(
 						$memoryLimitMessage,
 						ini_get('memory_limit'),
 						'Increase your memory limit in php.ini or run PHPStan with --memory-limit CLI option.',
-					), 'running parallel worker', [], null);
+					), 'running parallel worker', [], null, false);
 					$internalErrorsCount++;
 					return;
 				}

src/Parallel/Process.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Parallel;
 
-use Exception;
 use PHPStan\ShouldNotHappenException;
 use React\EventLoop\LoopInterface;
 use React\EventLoop\TimerInterface;
@@ -112,7 +111,7 @@ public function request(array $data): void
 		$this->in->write($data);
 		$this->timer = $this->loop->addTimer($this->timeoutSeconds, function (): void {
 			$onError = $this->onError;
-			$onError(new Exception(sprintf('Child process timed out after %.1f seconds. Try making it longer with parallel.processTimeout setting.', $this->timeoutSeconds)));
+			$onError(new ProcessTimedOutException(sprintf('Child process timed out after %.1f seconds. Try making it longer with parallel.processTimeout setting.', $this->timeoutSeconds)));
 		});
 	}
 

src/Parallel/ProcessTimedOutException.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Parallel;
+
+use Exception;
+
+class ProcessTimedOutException extends Exception
+{
+
+}