From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 22 Dec 2017 17:12:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c880037f57d1ed72a14bc0c25a56d9a272e5c9a;p=php

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

2c880037f57d1ed72a14bc0c25a56d9a272e5c9a
diff --cc NEWS
index 7a069511a0,d474e9fd08..df9e6b4da5
--- a/NEWS
+++ b/NEWS
@@@ -31,14 -18,12 +31,16 @@@ PH
      used). (Anton Artamonov)
  
  - SPL:
 -  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by
 +  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by 
      reference). (Nikita)
+   . Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent
+     class). (Nikita)
  
 -04 Jan 2018, PHP 7.1.13
 +- Zip:
 +  . Display headers (buildtime) and library (runtime) versions in phpinfo
 +    (with libzip >= 1.3.1). (Remi)
 +
 +14 Dec 2017, PHP 7.2.1RC1
  
  - Core:
    . Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26). (Laruence)