Require parentheses for nested compound patterns

Author: iluuu1994

Zend/tests/pattern_matching/is/compound_parentheses_1.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Nested compound patterns require parentheses
+--FILE--
+<?php
+var_dump(42 is Foo|Bar&Baz);
+?>
+--EXPECTF--
+Fatal error: Nested compound pattern must be parenthesized in %s on line %d

Zend/tests/pattern_matching/is/compound_parentheses_2.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Nested compound patterns require parentheses
+--FILE--
+<?php
+var_dump(42 is Foo&Bar|Baz);
+?>
+--EXPECTF--
+Fatal error: Nested compound pattern must be parenthesized in %s on line %d

Zend/zend_compile.c

@@ -6196,6 +6196,27 @@ static void zend_compile_array_pattern(zend_ast **ast_ptr)
 	}
 }
 
+static void verify_parenthesized_compound_pattern(zend_ast **ast_ptr, zend_ast_kind kind)
+{
+	zend_ast *ast = *ast_ptr;
+	zend_ast *lhs = ast->child[0];
+	zend_ast *rhs = ast->child[1];
+	if ((lhs->kind == kind && !(lhs->attr & ZEND_PARENTHESIZED_PATTERN))
+	 || (rhs->kind == kind && !(rhs->attr & ZEND_PARENTHESIZED_PATTERN))) {
+		zend_throw_exception(zend_ce_compile_error, "Nested compound pattern must be parenthesized", 0);
+	}
+}
+
+static void zend_compile_or_pattern(zend_ast **ast_ptr)
+{
+	verify_parenthesized_compound_pattern(ast_ptr, ZEND_AST_AND_PATTERN);
+}
+
+static void zend_compile_and_pattern(zend_ast **ast_ptr)
+{
+	verify_parenthesized_compound_pattern(ast_ptr, ZEND_AST_OR_PATTERN);
+}
+
 static void zend_compile_pattern(zend_ast **ast_ptr, void *context)
 {
 	zend_ast *ast = *ast_ptr;
@@ -6219,6 +6240,12 @@ static void zend_compile_pattern(zend_ast **ast_ptr, void *context)
 		case ZEND_AST_CLASS_CONST_PATTERN:
 			zend_compile_class_const_pattern(ast_ptr);
 			break;
+		case ZEND_AST_OR_PATTERN:
+			zend_compile_or_pattern(ast_ptr);
+			break;
+		case ZEND_AST_AND_PATTERN:
+			zend_compile_and_pattern(ast_ptr);
+			break;
 	}
 
 	zend_ast_apply(ast, zend_compile_pattern, context);

Zend/zend_compile.h

@@ -1126,6 +1126,8 @@ static zend_always_inline bool zend_check_arg_send_type(const zend_function *zf,
 /* Attribute for ternary inside parentheses */
 #define ZEND_PARENTHESIZED_CONDITIONAL 1
 
+#define ZEND_PARENTHESIZED_PATTERN 1
+
 /* For "use" AST nodes and the seen symbol table */
 #define ZEND_SYMBOL_CLASS    (1<<0)
 #define ZEND_SYMBOL_FUNCTION (1<<1)

Zend/zend_language_parser.y

@@ -1293,7 +1293,12 @@ atomic_pattern:
 	|	binding_pattern { $$ = $1; }
 	|	class_const_pattern { $$ = $1; }
 	|	T_UNDERSCORE { $$ = zend_ast_create(ZEND_AST_WILDCARD_PATTERN); }
-	|	'(' pattern ')' { $$ = $2; }
+	|	'(' pattern ')' {
+			$$ = $2;
+			if ($$->kind == ZEND_AST_OR_PATTERN || $$->kind == ZEND_AST_AND_PATTERN) {
+				$$->attr = ZEND_PARENTHESIZED_CONDITIONAL;
+			}
+		}
 ;
 
 compound_pattern: