Remove CTE flag from array_diff_ukey(), which was added by mistake

This was accidentally added in GH-7780, but since it takes a callable
argument, this flag is useless on this function.

Closes GH-10859.
This commit is contained in:
Michael Voříšek 2023-03-15 17:20:26 +01:00 committed by Niels Dossche
parent ff2f882c09
commit 5239f9fc86
3 changed files with 4 additions and 3 deletions

2
NEWS
View File

@ -9,6 +9,8 @@ PHP NEWS
. Fixed bug GH-8646 (Memory leak PHP FPM 8.1). (nielsdos)
. Re-add some CTE functions that were removed from being CTE by a mistake.
(mvorisek)
. Remove CTE flag from array_diff_ukey(), which was added by mistake.
(mvorisek)
. Fixed bug GH-10801 (Named arguments in CTE functions cause a segfault).
(nielsdos)

View File

@ -1125,7 +1125,6 @@ function array_diff_key(array $array, array ...$arrays): array {}
/**
* @param array|callable $rest
* @refcount 1
* @compile-time-eval
*/
function array_diff_ukey(array $array, ...$rest): array {}

View File

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 24cd8eddbff4da67929041932494952b49746f91 */
* Stub hash: 87494cb9126aefff143d4f55db9e282d8a30f4a2 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@ -2906,7 +2906,7 @@ static const zend_function_entry ext_functions[] = {
ZEND_FE(array_intersect_uassoc, arginfo_array_intersect_uassoc)
ZEND_FE(array_uintersect_uassoc, arginfo_array_uintersect_uassoc)
ZEND_SUPPORTS_COMPILE_TIME_EVAL_FE(array_diff_key, arginfo_array_diff_key)
ZEND_SUPPORTS_COMPILE_TIME_EVAL_FE(array_diff_ukey, arginfo_array_diff_ukey)
ZEND_FE(array_diff_ukey, arginfo_array_diff_ukey)
ZEND_SUPPORTS_COMPILE_TIME_EVAL_FE(array_diff, arginfo_array_diff)
ZEND_FE(array_udiff, arginfo_array_udiff)
ZEND_SUPPORTS_COMPILE_TIME_EVAL_FE(array_diff_assoc, arginfo_array_diff_assoc)