Transform Foo {} to Foo & {}

This avoids a grammar ambiguity.

Author: iluuu1994

Zend/tests/pattern_matching/is/binding.phpt

@@ -36,10 +36,10 @@ var_dump($a);
 var_dump('Hello world' is $a);
 var_dump($a);
 
-var_dump(new Box(42) is Box { value: $a });
+var_dump(new Box(42) is Box & { value: $a });
 var_dump($a);
 
-var_dump(new NotBox(43) is Box { value: $a });
+var_dump(new NotBox(43) is Box & { value: $a });
 var_dump($a);
 
 var_dump(43 is $a & int);
@@ -48,10 +48,10 @@ var_dump($a);
 var_dump([] is $a & string);
 var_dump($a);
 
-var_dump(new Many() is Many { $a, $b, $c, $d });
+var_dump(new Many() is { $a, $b, $c, $d });
 var_dump($a, $b, $c, $d, isset($e));
 
-var_dump(new Many() is Many { $a, $b, $c, $d, $e, $f, $g, $h, $i, $j });
+var_dump(new Many() is { $a, $b, $c, $d, $e, $f, $g, $h, $i, $j });
 var_dump($a, $b, $c, $d, $e, $f, $g, $h, $i, $j);
 
 ?>

Zend/tests/pattern_matching/is/delayed_binding.phpt

@@ -7,19 +7,19 @@ class Pair {
     public function __construct(public $a, public $b) {}
 }
 
-var_dump(new Pair(1, 2) is Pair { a: $a, b: $b });
+var_dump(new Pair(1, 2) is { a: $a, b: $b });
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(1, 2) is Pair { a: $a, b: 3 });
+var_dump(new Pair(1, 2) is { a: $a, b: 3 });
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(new \stdClass(), 2) is Pair { a: $a, b: 2 });
+var_dump(new Pair(new \stdClass(), 2) is { a: $a, b: 2 });
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(new \stdClass(), 2) is Pair { a: $a, b: 3 });
+var_dump(new Pair(new \stdClass(), 2) is { a: $a, b: 3 });
 var_dump($a, $b);
 unset($a, $b);
 

Zend/tests/pattern_matching/is/object.phpt

@@ -9,21 +9,21 @@ class Foo {
     ) {}
 
     public static function isSelfFoo($value) {
-        return $value is self {};
+        return $value is self;
     }
 
     public static function isStaticFoo($value) {
-        return $value is static {};
+        return $value is static;
     }
 }
 
 class Bar extends Foo implements Baz {
     public static function isSelfBar($value) {
-        return $value is self {};
+        return $value is self;
     }
 
     public static function isParentBar($value) {
-        return $value is parent {};
+        return $value is parent;
     }
 }
 
@@ -50,14 +50,14 @@ var_dump(null is Baz);
 var_dump(null is Qux);
 var_dump(null is Quux);
 
-var_dump($foo is Foo { a: 42 });
-var_dump($foo is Foo { a: 42|43 });
-var_dump($foo is Foo { a: 'hello world' });
-var_dump($foo is Foo { b: 42 });
-var_dump($bar is Foo { a: 42 });
-var_dump($bar is Foo { a: 42|43 });
-var_dump($bar is Foo { a: 'hello world' });
-var_dump($bar is Foo { b: 42 });
+var_dump($foo is { a: 42 });
+var_dump($foo is { a: 42|43 });
+var_dump($foo is { a: 'hello world' });
+var_dump($foo is { b: 42 });
+var_dump($bar is { a: 42 });
+var_dump($bar is { a: 42|43 });
+var_dump($bar is { a: 'hello world' });
+var_dump($bar is { b: 42 });
 
 var_dump(Foo::isSelfFoo($foo));
 var_dump(Foo::isSelfFoo($bar));

Zend/tests/pattern_matching/is/object_shorthand.phpt

@@ -7,9 +7,9 @@ class Foo {
     public function __construct(public $a, public $b) {}
 }
 
-var_dump(new Foo(1, 2) is Foo { $a, b: 2 });
+var_dump(new Foo(1, 2) is { $a, b: 2 });
 var_dump($a);
-var_dump(new Foo(1, 2) is Foo { a: 3, $b });
+var_dump(new Foo(1, 2) is { a: 3, $b });
 var_dump($b);
 
 ?>

Zend/zend_ast.h

@@ -116,6 +116,7 @@ enum _zend_ast_kind {
 	ZEND_AST_TYPE_PATTERN,
 	ZEND_AST_ARRAY_PATTERN,
 	ZEND_AST_BINDING_PATTERN,
+	ZEND_AST_OBJECT_PATTERN,
 
 	/* 2 child nodes */
 	ZEND_AST_DIM = 2 << ZEND_AST_NUM_CHILDREN_SHIFT,
@@ -161,7 +162,6 @@ enum _zend_ast_kind {
 	ZEND_AST_IS,
 	ZEND_AST_OR_PATTERN,
 	ZEND_AST_AND_PATTERN,
-	ZEND_AST_OBJECT_PATTERN,
 	ZEND_AST_OBJECT_PATTERN_ELEMENT,
 	ZEND_AST_RANGE_PATTERN,
 	ZEND_AST_ARRAY_PATTERN_ELEMENT,

Zend/zend_language_parser.y

@@ -964,9 +964,9 @@ attributed_class_statement:
 		property_modifiers optional_type_without_static property_list ';'
 			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, $3, NULL);
 			  $$->attr = $1; }
-	/*|	property_modifiers optional_type_without_static hooked_property
+	|	property_modifiers optional_type_without_static hooked_property
 			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, zend_ast_create_list(1, ZEND_AST_PROP_DECL, $3), NULL);
-			  $$->attr = $1; }*/
+			  $$->attr = $1; }
 	|	class_const_modifiers T_CONST class_const_list ';'
 			{ $$ = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, $3, NULL, NULL);
 			  $$->attr = $1; }
@@ -1125,7 +1125,7 @@ property_hook_list:
 
 optional_property_hook_list:
 		%empty	{ $$ = NULL; }
-	/*|	'{' property_hook_list '}'	{ $$ = $2; }*/
+	|	'{' property_hook_list '}'	{ $$ = $2; }
 ;
 
 property_hook_modifiers:
@@ -1394,7 +1394,7 @@ scalar_pattern:
 ;
 
 object_pattern:
-		atomic_pattern '{' object_pattern_element_list '}' { $$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN, $1, $3); }
+		'{' object_pattern_element_list '}' { $$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN, $2); }
 ;
 
 object_pattern_element_list:

Zend/zend_pattern_matching.c

@@ -124,12 +124,7 @@ static pm_result match_object(zval *zv, zend_ast *pattern)
 	}
 
 	zend_object *obj = Z_OBJ_P(zv);
-	pm_result type_result = match_type(zv, pattern->child[0]);
-	if (type_result != PM_MATCH) {
-		return type_result;
-	}
-
-	zend_ast_list *elements = zend_ast_get_list(pattern->child[1]);
+	zend_ast_list *elements = zend_ast_get_list(pattern->child[0]);
 	for (uint32_t i = 0; i < elements->children; i++) {
 		zend_ast *element = elements->child[i];
 		zend_ast *property_or_method_call = element->child[0];