Factory::extractBody() replaces multi-line & HEREDOC strings with single-line

Author: dg

src/PhpGenerator/Factory.php

@@ -241,6 +241,38 @@ private function extractBody(PhpParser\NodeFinder $nodeFinder, string $originalC
 			}
 		}
 
+		// multi-line strings => singleline
+		foreach (array_merge(
+			$nodeFinder->findInstanceOf($statements, Node\Scalar\String_::class),
+			$nodeFinder->findInstanceOf($statements, Node\Scalar\EncapsedStringPart::class)
+		) as $node) {
+			$token = substr($body, $node->getStartFilePos() - $start, $node->getEndFilePos() - $node->getStartFilePos() + 1);
+			if (strpos($token, "\n") !== false) {
+				$quote = $node instanceof Node\Scalar\String_ ? '"' : '';
+				$replacements[] = [
+					$node->getStartFilePos(),
+					$node->getEndFilePos(),
+					$quote . addcslashes($node->value, "\x00..\x1F") . $quote,
+				];
+			}
+		}
+
+		// HEREDOC => "string"
+		foreach ($nodeFinder->findInstanceOf($statements, Node\Scalar\Encapsed::class) as $node) {
+			if ($node->getAttribute('kind') === Node\Scalar\String_::KIND_HEREDOC) {
+				$replacements[] = [
+					$node->getStartFilePos(),
+					$node->parts[0]->getStartFilePos() - 1,
+					'"',
+				];
+				$replacements[] = [
+					end($node->parts)->getEndFilePos() + 1,
+					$node->getEndFilePos(),
+					'"',
+				];
+			}
+		}
+
 		//sort collected resolved names by position in file
 		usort($replacements, function ($a, $b) {
 			return $a[0] <=> $b[0];

tests/PhpGenerator/expected/ClassType.from.bodies.expect

@@ -58,28 +58,12 @@ abstract class Class7
 		comment */
 		// Alias Method will not be resolved in comment
 		if ($member instanceof \Abc\Method) {
-			$s1 = '
-a
-	b
-		c
-';
-			$s2 = "
-a
-	{$b}
-		$c
-";
+			$s1 = "\na\n\tb\n\t\tc\n";
+			$s2 = "\na\n\t{$b}\n\t\t$c\n";
 
-			$s3 = <<<DOC
-a
-	{$b}
-		$c
-DOC
+			$s3 = "a\n\t{$b}\n\t\t$c"
 		;
-			$s3 = <<<'DOC'
-a
-	b
-		c
-DOC
+			$s3 = "a\n\tb\n\t\tc"
 		;
 			?>
 a