From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 27 Jan 2018 12:12:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.3RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96595a232a7ad2031165152a2292ed3055507493;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
---

96595a232a7ad2031165152a2292ed3055507493
diff --cc NEWS
index f47d07c4e0,d14b616a64..f136e393f4
--- a/NEWS
+++ b/NEWS
@@@ -8,17 -8,10 +8,13 @@@ PH
  - ODBC:
    . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
  
- - SPL:
-   . Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
-     (cmb)
- 
 -01 Feb 2018, PHP 7.1.14
 +01 Feb 2018, PHP 7.2.2
  
  - Core:
 +  . Fixed bug #75742 (potential memleak in internal classes's static members).
 +    (Laruence)
    . Fixed bug #75679 (Path 260 character problem). (Anatol)
 +  . Fixed bug #75614 (Some non-portable == in shell scripts). (jdolecek)
    . Fixed bug #75786 (segfault when using spread operator on generator passed
      by reference). (Nikita)
    . Fixed bug #75799 (arg of get_defined_functions is optional). (carusogabriel)