From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 11:49:15 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a8476281679ce4e27091a67a98e9930b76cb53f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
---

6a8476281679ce4e27091a67a98e9930b76cb53f
diff --cc NEWS
index 1e1fb5cc63,a8305ac866..6a7902ad75
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,11 +1,19 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.19
 +?? ??? 2017, PHP 7.1.5
 +
 +- Core:
 +  . Fixed bug #74353 (Segfault when killing within bash script trap code).
 +    (Laruence)
 +  . Fixed bug #74340 (Magic function __get has different behavior in php 7.1.x).
 +    (Nikita)
 +  . Fixed bug #74188 (Null coalescing operator fails for undeclared static
 +    class properties). (tpunt)
  
+ - Date:
+   . Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
+     (krakjoe)
+ 
  - Fileinfo:
    . Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c).
      (Laruence)