]> granicus.if.org Git - php/commitdiff
Fix #80229: assert_options should have int and bool for parameter PHPDoc
authorMáté Kocsis <kocsismate@woohoolabs.com>
Sat, 17 Oct 2020 09:29:13 +0000 (11:29 +0200)
committerMáté Kocsis <kocsismate@woohoolabs.com>
Sat, 17 Oct 2020 10:01:07 +0000 (12:01 +0200)
Closes GH-6348

ext/standard/basic_functions.stub.php
ext/standard/basic_functions_arginfo.h

index 915f8b53988fdb6f6fd0eb9d7f2285d06803710c..98ea45be6becb1f8a4d3bacf87fcafaf524e2cf6 100755 (executable)
@@ -528,8 +528,7 @@ function get_html_translation_table(int $table = HTML_SPECIALCHARS, int $flags =
 
 function assert(mixed $assertion, Throwable|string|null $description = null): bool {}
 
-/** @param string|callable|null $value */
-function assert_options(int $option, $value = UNKNOWN): array|object|int|string|null {}
+function assert_options(int $option, mixed $value = UNKNOWN): array|object|int|string|null {}
 
 /* string.c */
 
index 7495807f1bbad3b4f26ff4628b4fd09a06cc989d..4cc243b3425d266abce21c0df8be1cb4a118e31d 100644 (file)
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4cac5b648d326f06e5866f32881583c87d9bce73 */
+ * Stub hash: 146996b3110f85a6a2d074fb910f0d7aae573358 */
 
 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)
@@ -796,7 +796,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_assert_options, 0, 1, MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
        ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-       ZEND_ARG_INFO(0, value)
+       ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_bin2hex arginfo_base64_encode