Extractor: fix escaping quotes when converting from HEREDOC [Closes #151

]
nette · Jan 17, 2024 · 19ac08c · 19ac08c
1 parent 3162d8d
commit 19ac08c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/PhpGenerator/Extractor.php b/src/PhpGenerator/Extractor.php
@@ -130,7 +130,7 @@ private function prepareReplacements(array $nodes): array
 					$replacements[] = [
 						$node->getStartFilePos() - $start,
 						$node->getEndFilePos() - $start,
-						$quote . addcslashes($node->value, "\x00..\x1F") . $quote,
+						$quote . addcslashes($node->value, "\x00..\x1F\"") . $quote,
 					];
 				}
 			} elseif ($node instanceof Node\Scalar\Encapsed) {

diff --git a/tests/PhpGenerator/expected/ClassType.from.bodies.expect b/tests/PhpGenerator/expected/ClassType.from.bodies.expect
@@ -85,7 +85,7 @@ abstract class Class7
 
 			$s3 = "a\n\t{$b}\n\t\t$c"
 		;
-			$s3 = "a\n\tb\n\t\tc"
+			$s4 = "a\n\tb\n\t\tc 'q1' \"q2\""
 		;
 		// inline HTML is not supported
 			?>

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.expect b/tests/PhpGenerator/expected/Extractor.bodies.expect
@@ -95,7 +95,7 @@ abstract class Class7
 
 			$s3 = "a\n\t{$b}\n\t\t$c"
 		;
-			$s3 = "a\n\tb\n\t\tc"
+			$s4 = "a\n\tb\n\t\tc 'q1' \"q2\""
 		;
 		// inline HTML is not supported
 			?>

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.resolving.expect b/tests/PhpGenerator/expected/Extractor.bodies.resolving.expect
@@ -90,7 +90,7 @@ abstract class Class7
 
 			$s3 = "a\n\t{$b}\n\t\t$c"
 		;
-			$s3 = "a\n\tb\n\t\tc"
+			$s4 = "a\n\tb\n\t\tc 'q1' \"q2\""
 		;
 		// inline HTML is not supported
 			?>

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect b/tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect
@@ -90,7 +90,7 @@ abstract class Class7
 
 			$s3 = "a\n\t{$b}\n\t\t$c"
 		;
-			$s3 = "a\n\tb\n\t\tc"
+			$s4 = "a\n\tb\n\t\tc 'q1' \"q2\""
 		;
 		// inline HTML is not supported
 			?>

diff --git a/tests/PhpGenerator/fixtures/bodies.php b/tests/PhpGenerator/fixtures/bodies.php
@@ -94,10 +94,10 @@ function complex()
 		$c
 DOC
 ;
-			$s3 = <<<'DOC'
+			$s4 = <<<'DOC'
 a
 	b
-		c
+		c 'q1' "q2"
 DOC
 ;
 		// inline HTML is not supported