From: Joe Watkins <krakjoe@php.net>
Date: Tue, 27 Mar 2018 19:57:28 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e267ca91bdde9430db3236602652c4fbf2580fa;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76131 some arginfo params are different from the documentation
---

3e267ca91bdde9430db3236602652c4fbf2580fa
diff --cc NEWS
index 02b4518c70,db2833d792..d733efeb2a
--- a/NEWS
+++ b/NEWS
@@@ -1,27 -1,20 +1,34 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.17
 +?? ??? 2018, PHP 7.2.5
 +
 +- Core:
 +  . Fixed bug #75722 (Convert valgrind detection to configure option).
 +    (Michael Heimpold)
  
- - Mbstring:
+ - Date:
+   . Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)
+ 
+ - mbstring:
    . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
    . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
      (chrullrich, cmb)
  
 +- ODBC:
 +  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
 +    (cmb)
 +
 +- Opcache:
 +  . Fixed bug #76094 (Access violation when using opcache). (Laruence)
 +
+ - SPL:
+   . Fixed bug #76131 (mismatch arginfo for splarray constructor). 
+     (carusogabriel)
+ 
 -29 Mar 2018, PHP 7.1.16
 +- Standard:
 +  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
 +
 +29 Mar 2018, PHP 7.2.4
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).