]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 28 Sep 2019 15:17:18 +0000 (17:17 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 28 Sep 2019 15:17:18 +0000 (17:17 +0200)
1  2 
Zend/zend_language_scanner.l

index 86b8bb1a7047a1c1dc1c0f6266e124546cded854,2b432abe54f05dc554a3a7a982193726847bc0af..bfe71705b95aa92969d3221c6c7d9dee6a0c3014
@@@ -2833,12 -2752,10 +2833,14 @@@ nowdoc_scan_done
                RETURN_TOKEN(END);
        }
  
-       zend_error(E_COMPILE_WARNING, "Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
+       if (!SCNG(heredoc_scan_ahead)) {
+               zend_error(E_COMPILE_WARNING, "Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
+       }
 -      goto restart;
 +      if (PARSER_MODE()) {
 +              goto restart;
 +      } else {
 +              RETURN_TOKEN(T_BAD_CHARACTER);
 +      }
  }
  
  */