From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 8 Apr 2020 10:00:48 +0000 (+0200)
Subject: Update mb_strrpos() stub
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38d93262a0af02bae20b717a26f62085b6721736;p=php

Update mb_strrpos() stub

We no longer accept the encoding as 3rd param, so we can make this
a proper int argument.
---

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