clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source
This commit is contained in:
Bob Weinand 2022-03-07 22:25:52 +01:00
commit 67b372e287
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend.c
View File

@ -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;

2
ext/zend_test/test.stub.php
View File

@ -109,7 +109,7 @@ namespace {
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 {

2
ext/zend_test/test_arginfo.h
View File

@ -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()