Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid duplicate octal warning during heredoc scan ahead

diff --cc Zend/tests/warning_during_heredoc_scan_ahead.phpt
index 0000000000000000000000000000000000000000,c252be1f4f28c4f68f830ca0da3563783b0eefc7..7def8a4554e6a1d4b28a3db03f9440a17ffa05ac
mode 000000,100644..100644
--- /dev/null
--- 2/Zend/tests/warning_during_heredoc_scan_ahead.phpt
+++ b/Zend/tests/warning_during_heredoc_scan_ahead.phpt
@@@ -1,0 -1,23 +1,17 @@@
 -${x\ 1}
+ --TEST--
+ No warnings should be thrown during heredoc scan-ahead
+ --FILE--
+ <?php
+ 
+ <<<TEST
 -${/*}
+ \400
+ ${"\400"}
 -Warning: Unexpected character in input:  '\ 1' (ASCII=1) state=0 in %s on line %d
 -
+ TEST;
+ 
+ ?>
+ --EXPECTF--
 -Warning: Unterminated comment starting line %d in %s on line %d
 -
 -Parse error: syntax error, unexpected end of file in %s on line %d
+ Warning: Octal escape sequence overflow \400 is greater than \377 in %s on line %d
+ 
+ Warning: Octal escape sequence overflow \400 is greater than \377 in %s on line %d
+ 
++Warning: Undefined variable $ in %s on line %d

diff --cc Zend/zend_language_scanner.l
Simple merge