Check for \r as newline in closing tag

Fixes #761.
nikic · Apr 25, 2021 · 4848a0d · 4848a0d
1 parent 8eb194e
commit 4848a0d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/PhpParser/Lexer.php b/lib/PhpParser/Lexer.php
@@ -322,7 +322,8 @@ public function getNextToken(&$value = null, &$startAttributes = null, &$endAttr
                 $value = $token[1];
                 $id = $this->tokenMap[$token[0]];
                 if (\T_CLOSE_TAG === $token[0]) {
-                    $this->prevCloseTagHasNewline = false !== strpos($token[1], "\n");
+                    $this->prevCloseTagHasNewline = false !== strpos($token[1], "\n")
+                        || false !== strpos($token[1], "\r");
                 } elseif (\T_INLINE_HTML === $token[0]) {
                     $startAttributes['hasLeadingNewline'] = $this->prevCloseTagHasNewline;
                 }

diff --git a/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test b/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test
@@ -55,4 +55,13 @@ HTML<?php echo 'PHP'; ?>HTML
 -----
 HTML<?php
 echo 'PHP';
-?>HTML
+?>HTML
+-----
+<?php
+echo 'PHP';
+?>@@{ "\r\r\n" }@@Test
+-----
+<?php
+
+echo 'PHP';
+?>@@{ "\n\n" }@@Test