summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-04-08 12:00:48 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-04-08 12:03:14 +0200
commit38d93262a0af02bae20b717a26f62085b6721736 (patch)
treecba4a2cd2274efc3505d1e6c5ce8c4b5ef0af11b
parent3042b2b2012fa1f701170282e4f7ac55089f79b0 (diff)
downloadphp-git-38d93262a0af02bae20b717a26f62085b6721736.tar.gz
Update mb_strrpos() stub
We no longer accept the encoding as 3rd param, so we can make this a proper int argument.
-rw-r--r--ext/mbstring/mbstring.stub.php2
-rw-r--r--ext/mbstring/mbstring_arginfo.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/ext/mbstring/mbstring.stub.php b/ext/mbstring/mbstring.stub.php
index 2cc95c6920..7a75d4099f 100644
--- a/ext/mbstring/mbstring.stub.php
+++ b/ext/mbstring/mbstring.stub.php
@@ -27,7 +27,7 @@ function mb_strlen(string $str, string $encoding = UNKNOWN): int {}
function mb_strpos(string $haystack, string $needle, int $offset = 0, string $encoding = UNKNOWN): int|false {}
-function mb_strrpos(string $haystack, string $needle, $offset = UNBEK, string $encoding = UNKNOWN): int|false {}
+function mb_strrpos(string $haystack, string $needle, int $offset = 0, string $encoding = UNKNOWN): int|false {}
function mb_stripos(string $haystack, string $needle, int $offset = 0, string $encoding = UNKNOWN): int|false {}
diff --git a/ext/mbstring/mbstring_arginfo.h b/ext/mbstring/mbstring_arginfo.h
index e252cdb1f0..52b92617c2 100644
--- a/ext/mbstring/mbstring_arginfo.h
+++ b/ext/mbstring/mbstring_arginfo.h
@@ -54,12 +54,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_strpos, 0, 2, MAY_BE_LONG|MAY
ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_strrpos, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
- ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
- ZEND_ARG_INFO(0, offset)
- ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_mb_strrpos arginfo_mb_strpos
#define arginfo_mb_stripos arginfo_mb_strpos