Merge branch 'PHP-8.0' into PHP-8.1

bwoebi · bwoebi · commit 67b372e2877c · 2022-03-07T22:25:52.000+01:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -670,7 +670,7 @@ static void function_copy_ctor(zval *zv) /* {{{ */
 
 		func->common.attributes = NULL;
 
-		ZEND_HASH_PACKED_FOREACH_PTR(old_func->common.attributes, old_attr) {
+		ZEND_HASH_FOREACH_PTR(old_func->common.attributes, old_attr) {
 			uint32_t i;
 			zend_attribute *attr;
 
diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php
@@ -109,7 +109,7 @@ function zend_weakmap_dump(): array {}
 
     function zend_get_unit_enum(): ZendTestUnitEnum {}
 
-    function zend_test_parameter_with_attribute(#[ZendTestParameterAttribute] string $parameter): int {}
+    function zend_test_parameter_with_attribute(string $parameter): int {}
 }
 
 namespace ZendTestNS {
diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 57eb52664b0a7b3dd2a38294e9a936d248274a14 */
+ * Stub hash: 0a2826d081b33a542c1b2fc9a5812954fcc059f9 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ function zend_weakmap_dump(): array {}`
`109`	`109`
`110`	`110`	`function zend_get_unit_enum(): ZendTestUnitEnum {}`
`111`	`111`
`112`		`- function zend_test_parameter_with_attribute(#[ZendTestParameterAttribute] string $parameter): int {}`
	`112`	`+ function zend_test_parameter_with_attribute(string $parameter): int {}`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`namespace ZendTestNS {`