Skip to content

Commit 774cdb1

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 9483c50 + e4ecadc commit 774cdb1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static const func_info_t func_infos[] = {
275275
F0("sleep", MAY_BE_FALSE | MAY_BE_LONG),
276276
F0("usleep", MAY_BE_NULL | MAY_BE_FALSE),
277277
#if HAVE_NANOSLEEP
278-
F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
278+
F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG),
279279
F0("time_sleep_until", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
280280
#endif
281281
#if HAVE_STRPTIME
@@ -400,7 +400,7 @@ static const func_info_t func_infos[] = {
400400
F1("system", MAY_BE_FALSE | MAY_BE_STRING),
401401
F1("escapeshellcmd", MAY_BE_NULL | MAY_BE_STRING),
402402
F1("escapeshellarg", MAY_BE_NULL | MAY_BE_STRING),
403-
F1("passthru", MAY_BE_FALSE | MAY_BE_STRING),
403+
F1("passthru", MAY_BE_NULL | MAY_BE_FALSE),
404404
F1("shell_exec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
405405
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
406406
F1("proc_open", MAY_BE_FALSE | MAY_BE_RESOURCE),

0 commit comments

Comments
 (0)