Merge branch 'PHP-7.1' into PHP-7.2

9 years ago · 91240073ea
3 changed files with 8 additions and 1 deletions
--- a/4
+++ b/4
@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.2.0beta3

+- Mbstring:
+  . Fixed bug #75001 (Wrong reflection on mb_eregi_replace). (Fabien
+    Villepinte)
+
 - SQLite3:
  . Updated to SQLite 3.20.0. (cmb)

--- a/ext/intl/tests/transliterator_create_inverse_basic.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_basic.phpt
@ -21,7 +21,8 @@ echo $orstr,"\n";
 echo $new_str,"\n";
 echo $recovstr,"\n";

-var_dump(($orstr == $recovstr) == $recovstr2);
+var_dump($orstr === $recovstr);
+var_dump($orstr === $recovstr2);

 echo "Done.\n";
 --EXPECT--
@ -29,4 +30,5 @@ echo "Done.\n";
 ōshanbyū
 オーシャンビュー
 bool(true)
+bool(true)
 Done.
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@ -477,6 +477,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_eregi_replace, 0, 0, 3)
 	ZEND_ARG_INFO(0, pattern)
 	ZEND_ARG_INFO(0, replacement)
 	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_replace_callback, 0, 0, 3)