From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 2 Aug 2017 16:10:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta3~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91240073ea75d0e0d495572e85fbd31d704fab14;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

91240073ea75d0e0d495572e85fbd31d704fab14
diff --cc NEWS
index 8487a16557,23779913e9..d484e22668
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,8 +1,22 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.9
 +?? ??? ????, PHP 7.2.0beta3
 +
++- Mbstring:
++  . Fixed bug #75001 (Wrong reflection on mb_eregi_replace). (Fabien
++    Villepinte)
++
 +- SQLite3:
 +  . Updated to SQLite 3.20.0. (cmb)
 +
 +- SPL:
 +  . Added spl_object_id(). (Tyson Andre)
 +
 +03 Aug 2017, PHP 7.2.0beta2
  
  - Core:
 +  . Implemented FR #74963 (Improved error message on fetching property of
 +    non-object). (Laruence)
    . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
    . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)