Deprecate encoding as 3rd param to mb_strrpos()

nikic · nikic · commit 39e756e7fe7b · 2019-07-22T11:39:52.000+02:00
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -2600,6 +2600,9 @@ PHP_FUNCTION(mb_strrpos)
 					break;
 				default :
 					enc_name = Z_STR_P(zoffset);
+					php_error_docref(NULL, E_DEPRECATED,
+						"Passing the encoding as third parameter is deprecated. "
+						"Use an explicit zero offset");
 					break;
 			}
 		} else {
diff --git a/ext/mbstring/tests/mb_strrpos_encoding_3rd_param.phpt b/ext/mbstring/tests/mb_strrpos_encoding_3rd_param.phpt
@@ -9,5 +9,6 @@ mb_internal_encoding('UTF-16');
 var_dump(mb_strrpos("abc abc abc", "abc", "UTF-8"));
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(8)
diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt
@@ -38,24 +38,36 @@ foreach ($inputs as $type => $input) {
 
 echo "Done";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing mb_strrpos() : usage variations ***
 
 -- Double Quoted String --
 -- With fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 -- Without fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 
 -- Single Quoted String --
 -- With fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 -- Without fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 
 -- Heredoc --
 -- With fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 -- Without fourth encoding argument --
+
+Deprecated: mb_strrpos(): Passing the encoding as third parameter is deprecated. Use an explicit zero offset in %s on line %d
 int(20)
 Done
