From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Apr 2017 06:57:07 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0959e6f4225a92206849aaab1cb2d322ac45bbe2;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74439 Wrong reflection on the Locale methods
---

0959e6f4225a92206849aaab1cb2d322ac45bbe2
diff --cc NEWS
index 5c605b8cc9,59420cc6bd..2b6db31f3d
--- a/NEWS
+++ b/NEWS
@@@ -34,16 -31,7 +34,17 @@@ PH
    . Fixed bug #74376 (Invalid free of persistent results on error/connection
      loss). (Yussuf Khalil)
  
 +- Intl:
 +  . Fixed bug #65683 (Intl does not support DateTimeImmutable). (Ben Scholzen)
 +  . Fixed bug #74298 (IntlDateFormatter->format() doesn't return
 +    microseconds/fractions). (Andrew Nester)
 +  . Fixed bug #74433 (wrong reflection for Normalizer methods). (villfa)
++  . Fixed bug #74439 (wrong reflection for Locale methods). (villfa)
 +
 +- Opcache:
 +  . Fixed bug #74431 (foreach infinite loop). (Nikita)
 +  . Fixed bug #74442 (Opcached version produces a nested array). (Nikita)
 +
  - OpenSSL:
    . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
      seconds). (Moritz Fain)