Merge branch 'deprecate_concat_add_sub' into PHP-8.4

diff --cc Zend/zend_ast.c
Simple merge

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_language_parser.y
index 22394868ba0159da4e688d19038e4911335a3f46,4c2a7fdce70e374d8740f6219191bcaa7dc4f11e..b20c619f050e81ded1284e68b559ca558d2de20c
--- 1/Zend/zend_language_parser.y
--- 2/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@@ -961,10 -957,7 +961,11 @@@ expr
                        { $$ = zend_ast_create_binary_op(ZEND_SPACESHIP, $1, $3); }
        |       expr T_INSTANCEOF class_name_reference
                        { $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); }
 -      |       '(' expr ')' { $$ = $2; if ($$->kind == ZEND_AST_BINARY_OP && $$->attr == ZEND_CONCAT) $$->attr = ZEND_PARENTHESIZED_CONCAT; }
 +      |       '(' expr ')' {
 +                      $$ = $2;
 +                      if ($$->kind == ZEND_AST_CONDITIONAL) $$->attr = ZEND_PARENTHESIZED_CONDITIONAL;
++                      if ($$->kind == ZEND_AST_BINARY_OP && $$->attr == ZEND_CONCAT) $$->attr = ZEND_PARENTHESIZED_CONCAT;
 +              }
        |       new_expr { $$ = $1; }
        |       expr '?' expr ':' expr
                        { $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, $3, $5); }

diff --cc Zend/zend_opcode.c
Simple merge