Moved debugging output to IdentifiedGeneratorInStack

Author: ondrejmirtes

src/Analyser/Generator/GeneratorNodeScopeResolver.php

@@ -23,7 +23,6 @@
 use function get_class;
 use function get_debug_type;
 use function implode;
-use function is_array;
 use function sprintf;
 
 /**
@@ -134,25 +133,12 @@ private function processStmtNodes(
 		} catch (Throwable $e) {
 			$stackTrace = [];
 			foreach (array_merge($stack, [$gen]) as $identifiedGenerator) {
-				if ($identifiedGenerator->file === null && $identifiedGenerator->line === null) {
-					continue;
-				}
-				if (is_array($identifiedGenerator->node)) {
-					$stackTrace[] = sprintf(
-						"Stmts\n    -> %s on line %d",
-						$identifiedGenerator->file,
-						$identifiedGenerator->line,
-					);
+				$string = (string) $identifiedGenerator;
+				if ($string === '') {
 					continue;
 				}
 
-				$stackTrace[] = sprintf(
-					"%s:%d\n    -> %s on line %d",
-					$identifiedGenerator->file,
-					$identifiedGenerator->line,
-					get_class($identifiedGenerator->node),
-					$identifiedGenerator->node->getStartLine(),
-				);
+				$stackTrace[] = $string;
 			}
 
 			throw new TrampolineException(sprintf(

src/Analyser/Generator/IdentifiedGeneratorInStack.php

@@ -3,7 +3,11 @@
 namespace PHPStan\Analyser\Generator;
 
 use Generator;
+use Override;
 use PhpParser\Node;
+use function get_class;
+use function is_array;
+use function sprintf;
 
 /**
  * @phpstan-import-type GeneratorTValueType from GeneratorNodeScopeResolver
@@ -33,4 +37,28 @@ public function __construct(
 	{
 	}
 
+	#[Override]
+	public function __toString(): string
+	{
+		if ($this->file === null || $this->line === null) {
+			return '';
+		}
+
+		if (is_array($this->node)) {
+			return sprintf(
+				"Stmts\n    -> %s on line %d",
+				$this->file,
+				$this->line,
+			);
+		}
+
+		return sprintf(
+			"%s:%d\n    -> %s on line %d",
+			$this->file,
+			$this->line,
+			get_class($this->node),
+			$this->node->getStartLine(),
+		);
+	}
+
 }