From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 24 May 2017 16:01:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7a706502475872928848f6606390eb77d274fdf;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

e7a706502475872928848f6606390eb77d274fdf
diff --cc NEWS
index 4558e98d58,daab8dcc33..d7fc7134c6
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.21
 +?? ??? 2017, PHP 7.1.7
  
- 
+ - SPL:
+   . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
+     (jhdxr)
  
 -8 Jun 2017 PHP 7.0.20
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).