fix: dump heredoc tags

xepozz · xepozz · commit 8ee2a9857b1a · 2025-05-28T19:50:50.000+03:00
diff --git a/Zend/tests/heredoc_nowdoc/heredoc_print.phpt b/Zend/tests/heredoc_nowdoc/heredoc_print.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Dump heredoc tags
+--INI--
+zend.assertions=1
+--FILE--
+<?php
+try {
+    assert(false &&
+    <<<HTML
+    val inside
+    HTML
+    );
+} catch(\Throwable $e) {
+    echo $e->getMessage();
+}
+
+?>
+--EXPECT--
+assert(false && <<<HEREDOC
+val inside
+HEREDOC)
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -1630,8 +1630,10 @@ static ZEND_COLD void zend_ast_export_if_stmt(smart_str *str, zend_ast_list *lis
 	smart_str_appendc(str, '}');
 }
 
-static ZEND_COLD void zend_ast_export_zval(smart_str *str, zval *zv, int priority, int indent)
+static ZEND_COLD void zend_ast_export_zval(smart_str *str, zend_ast *ast, int priority, int indent)
 {
+	zval *zv = zend_ast_get_zval(ast);
+
 	ZVAL_DEREF(zv);
 	switch (Z_TYPE_P(zv)) {
 		case IS_NULL:
@@ -1651,9 +1653,15 @@ static ZEND_COLD void zend_ast_export_zval(smart_str *str, zval *zv, int priorit
 				str, Z_DVAL_P(zv), (int) EG(precision), /* zero_fraction */ false);
 			break;
 		case IS_STRING:
-			smart_str_appendc(str, '\'');
-			zend_ast_export_str(str, Z_STR_P(zv));
-			smart_str_appendc(str, '\'');
+			if (ast->attr & ZEND_NAME_HEREDOC) {
+				smart_str_appends(str, "<<<HEREDOC\n");
+				zend_ast_export_str(str, Z_STR_P(zv));
+				smart_str_appends(str, "\nHEREDOC");
+			} else {
+				smart_str_appendc(str, '\'');
+				zend_ast_export_str(str, Z_STR_P(zv));
+				smart_str_appendc(str, '\'');
+			}
 			break;
 		case IS_ARRAY: {
 			zend_long idx;
@@ -1878,7 +1886,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 	switch (ast->kind) {
 		/* special nodes */
 		case ZEND_AST_ZVAL:
-			zend_ast_export_zval(str, zend_ast_get_zval(ast), priority, indent);
+			zend_ast_export_zval(str, ast, priority, indent);
 			break;
 		case ZEND_AST_CONSTANT: {
 			zend_string *name = zend_ast_get_constant_name(ast);
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -1034,6 +1034,7 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 #define ZEND_NAME_FQ       0
 #define ZEND_NAME_NOT_FQ   1
 #define ZEND_NAME_RELATIVE 2
+#define ZEND_NAME_HEREDOC  3
 
 /* ZEND_FETCH_ flags in class name AST of new const expression must not clash with ZEND_NAME_ flags */
 #define ZEND_CONST_EXPR_NEW_FETCH_TYPE_SHIFT 2
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -3132,6 +3132,10 @@ emit_token_with_val:
 	if (PARSER_MODE()) {
 		ZEND_ASSERT(Z_TYPE_P(zendlval) != IS_UNDEF);
 		elem->ast = zend_ast_create_zval_with_lineno(zendlval, start_line);
+        zend_ptr_stack *stack = &SCNG(heredoc_label_stack);
+        if (stack->elements) {
+            elem->ast->attr |= ZEND_NAME_HEREDOC;
+        }
 	}
 
 emit_token:
