Skip to content

Commit 33ddc3b

Browse files
committed
Fix mb_ereg_search* arg and func info
1 parent da4262d commit 33ddc3b

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

ext/mbstring/mbstring.stub.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ function mb_split(string $pattern, string $string, int $limit = -1): array|false
105105

106106
function mb_ereg_match(string $pattern, string $string, string $option = UNKNOWN): bool {}
107107

108-
function mb_ereg_search(string $pattern = UNKNOWN, string $option = UNKNOWN): array|bool {}
108+
function mb_ereg_search(string $pattern = UNKNOWN, string $option = UNKNOWN): bool {}
109109

110-
function mb_ereg_search_pos(string $pattern = UNKNOWN, string $option = UNKNOWN): array|bool {}
110+
function mb_ereg_search_pos(string $pattern = UNKNOWN, string $option = UNKNOWN): array|false {}
111111

112-
function mb_ereg_search_regs(string $pattern = UNKNOWN, string $option = UNKNOWN): array|bool {}
112+
function mb_ereg_search_regs(string $pattern = UNKNOWN, string $option = UNKNOWN): array|false {}
113113

114114
function mb_ereg_search_init(string $string, string $pattern = UNKNOWN, string $option = UNKNOWN): bool {}
115115

ext/mbstring/mbstring_arginfo.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 0be93f43fd04fb04e07076006a5c1a94bf6afad0 */
2+
* Stub hash: fad341194e6c8e180b17f9ba168c062a13db2977 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL)
55
ZEND_ARG_TYPE_INFO(0, language, IS_STRING, 0)
@@ -263,18 +263,21 @@ ZEND_END_ARG_INFO()
263263
#endif
264264

265265
#if defined(HAVE_MBREGEX)
266-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg_search, 0, 0, MAY_BE_ARRAY|MAY_BE_BOOL)
266+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_ereg_search, 0, 0, _IS_BOOL, 0)
267267
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
268268
ZEND_ARG_TYPE_INFO(0, option, IS_STRING, 0)
269269
ZEND_END_ARG_INFO()
270270
#endif
271271

272272
#if defined(HAVE_MBREGEX)
273-
#define arginfo_mb_ereg_search_pos arginfo_mb_ereg_search
273+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg_search_pos, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
274+
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
275+
ZEND_ARG_TYPE_INFO(0, option, IS_STRING, 0)
276+
ZEND_END_ARG_INFO()
274277
#endif
275278

276279
#if defined(HAVE_MBREGEX)
277-
#define arginfo_mb_ereg_search_regs arginfo_mb_ereg_search
280+
#define arginfo_mb_ereg_search_regs arginfo_mb_ereg_search_pos
278281
#endif
279282

280283
#if defined(HAVE_MBREGEX)

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,8 @@ static const func_info_t func_infos[] = {
562562
F1("mb_ereg_replace_callback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
563563
F1("mb_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
564564
F1("mb_ereg_search_pos", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
565-
F1("mb_ereg_search_regs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING),
566-
F1("mb_ereg_search_getregs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING),
565+
F1("mb_ereg_search_regs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_STRING),
566+
F1("mb_ereg_search_getregs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_STRING),
567567

568568
/* ext/iconv */
569569
F1("iconv", MAY_BE_FALSE | MAY_BE_STRING),

0 commit comments

Comments
 (0)