Skip to content

Commit ea4807e

Browse files
committed
restore func info entries
1 parent 4f4965a commit ea4807e

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

Zend/Optimizer/zend_func_infos.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,8 @@ static const func_info_t func_infos[] = {
450450
F1("compact", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
451451
FN("array_fill", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY),
452452
F1("array_fill_keys", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
453+
FN("array_replace", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
454+
FN("array_replace_recursive", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
453455
FN("array_keys", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING),
454456
FN("array_values", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
455457
F1("array_count_values", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG),
@@ -458,8 +460,13 @@ static const func_info_t func_infos[] = {
458460
F1("array_flip", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING),
459461
F1("array_change_key_case", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
460462
F1("array_intersect_key", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
463+
FN("array_intersect_ukey", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
464+
FN("array_intersect", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
465+
FN("array_uintersect", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
461466
F1("array_intersect_assoc", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
462467
F1("array_uintersect_assoc", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
468+
FN("array_intersect_uassoc", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
469+
FN("array_uintersect_uassoc", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
463470
F1("array_diff_key", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
464471
F1("array_diff_ukey", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
465472
F1("array_udiff", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),

Zend/zend_execute.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,9 @@ ZEND_API ZEND_COLD void zend_internal_call_arginfo_violation(zend_function *fbc)
13071307
# define ZEND_VERIFY_FUNC_INFO 0
13081308
#endif
13091309

1310+
#undef ZEND_VERIFY_FUNC_INFO
1311+
#define ZEND_VERIFY_FUNC_INFO 1
1312+
13101313
static void zend_verify_internal_func_info(zend_function *fn, zval *retval) {
13111314
#if ZEND_VERIFY_FUNC_INFO
13121315
zend_string *name = fn->common.function_name;

ext/standard/basic_functions.stub.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,11 +1678,13 @@ function array_merge_recursive(array ...$arrays): array {}
16781678

16791679
/**
16801680
* @compile-time-eval
1681+
* @return array<int|string, mixed|ref>
16811682
*/
16821683
function array_replace(array $array, array ...$replacements): array {}
16831684

16841685
/**
16851686
* @compile-time-eval
1687+
* @return array<int|string, mixed|ref>
16861688
*/
16871689
function array_replace_recursive(array $array, array ...$replacements): array {}
16881690

@@ -1755,16 +1757,19 @@ function array_intersect_key(array $array, array ...$arrays): array {}
17551757

17561758
/**
17571759
* @param array|callable $rest
1760+
* @return array<int|string, mixed|ref>
17581761
*/
17591762
function array_intersect_ukey(array $array, ...$rest): array {}
17601763

17611764
/**
17621765
* @compile-time-eval
1766+
* @return array<int|string, mixed|ref>
17631767
*/
17641768
function array_intersect(array $array, array ...$arrays): array {}
17651769

17661770
/**
17671771
* @param array|callable $rest
1772+
* @return array<int|string, mixed|ref>
17681773
*/
17691774
function array_uintersect(array $array, ...$rest): array {}
17701775

@@ -1782,11 +1787,13 @@ function array_uintersect_assoc(array $array, ...$rest): array {}
17821787

17831788
/**
17841789
* @param array|callable $rest
1790+
* @return array<int|string, mixed|ref>
17851791
*/
17861792
function array_intersect_uassoc(array $array, ...$rest): array {}
17871793

17881794
/**
17891795
* @param array|callable $rest
1796+
* @return array<int|string, mixed|ref>
17901797
*/
17911798
function array_uintersect_uassoc(array $array, ...$rest): array {}
17921799

ext/standard/basic_functions_arginfo.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)