From: Joe Watkins <krakjoe@php.net>
Date: Thu, 13 Apr 2017 12:21:17 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd32837acf51cc28d13ade6c1aeff6bffb4430ee;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74433 Wrong reflection on the Normalizer methods
---

bd32837acf51cc28d13ade6c1aeff6bffb4430ee
diff --cc NEWS
index f324355363,d664db7e6a..d97d061535
--- a/NEWS
+++ b/NEWS
@@@ -31,11 -28,6 +31,12 @@@ 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)
 +
  - OpenSSL:
    . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
      seconds). (Moritz Fain)