fix - problema formatting in php < 7.3

Author: driade

fmt.stub.php

@@ -3538,7 +3538,7 @@ public function format($source) {
 	}
 
 	final class LeftAlignComment extends FormatterPass {
-		const NON_INDENTABLE_COMMENT = "/*\x2 COMMENT \x3*/";
+		const NON_INDENTABLE_COMMENT = "/*__PHPFMT_NON_INDENTABLE_COMMENT__*/";
 
 		public function candidate($source, $foundTokens) {
 			if (
@@ -3821,6 +3821,9 @@ public function format($source) {
 				case T_START_HEREDOC:
 					$this->appendCode($text);
 					$this->printUntil(T_END_HEREDOC);
+					if ($this->rightUsefulTokenIs(ST_SEMI_COLON)) {
+						$this->printUntil(ST_SEMI_COLON);
+					}
 					break;
 
 				case T_COMMENT:
@@ -4969,11 +4972,10 @@ public function format($source) {
                     break;
                 case T_START_HEREDOC:
                     $this->appendCode($text);
-                    if (count($attributeStack)) {
-                        $this->printUntil(T_END_HEREDOC);
-                    } else {
-						$this->printUntil(T_END_HEREDOC);
-                    }
+					$this->printUntil(T_END_HEREDOC);
+					if ($this->rightUsefulTokenIs(ST_SEMI_COLON)) {
+						$this->printUntil(ST_SEMI_COLON);
+					}
                     break;
 
                 case T_CALLABLE:

tests/Original/525-heredoc-or-die.in

@@ -1,5 +1,6 @@
 <?php
 //passes:AutoSemicolon
+//version:7.3
 // Have a free MRE for both options. Run the formatter over this and both will break.
 print_r(<<<SQL
     SELECT *

tests/Original/525-heredoc-or-die.out

@@ -1,5 +1,6 @@
 <?php
 //passes:AutoSemicolon
+//version:7.3
 // Have a free MRE for both options. Run the formatter over this and both will break.
 print_r(<<<SQL
     SELECT *