Merge branch 'PHP-7.3'

petk · petk · commit b10082f942fa · 2018-10-15T05:04:38.000+02:00
* PHP-7.3:
  Fix failing Zend/tests due to newlines
diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/flexible-heredoc-error7.phpt
@@ -6,5 +6,6 @@ Note: the closing ?> has been deliberately elided.
 <?php
 
 echo <<<END
+
 --EXPECTF--
 Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error7.phpt b/Zend/tests/flexible-nowdoc-error7.phpt
@@ -6,5 +6,6 @@ Note: the closing ?> has been deliberately elided.
 <?php
 
 echo <<<'END'
+
 --EXPECTF--
 Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
