Merge branch 'PHP-7.1' into PHP-7.2

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

diff --cc NEWS
index f136e393f4d7e974d9d409395202a15de3ea8404,40fc8e861ac79a0f48ec916fd4f35bf044feacd5..f47d07c4e0234b1f42caeabf6be877795f69461a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -8,13 -8,14 +8,17 @@@ PH
  - ODBC:
    . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
  
 -01 Feb 2018, PHP 7.1.14
+ - SPL:
+   . Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
+     (cmb)
+ 
 +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)

diff --cc ext/spl/spl_iterators.c
Simple merge