From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 6 Oct 2017 14:46:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC4~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f551385330b0b9709ffca83a87e3ed03706b37d;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
---

0f551385330b0b9709ffca83a87e3ed03706b37d
diff --cc NEWS
index 0e0c844d17,7079d817c0..a4c0e3958e
--- a/NEWS
+++ b/NEWS
@@@ -17,9 -17,13 +17,13 @@@ PH
    . Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in
      apache2handler). (mcarbonneaux)
  
 +- Hash:
 +  . Fixed bug #75303 (sha3 hangs on bigendian). (Remi)
 +
+ - Intl:
+   . Fixed bug #75318 (The parameter of UConverter::getAliases() is not
+     optional). (cmb)
+ 
 -- OCI8:
 -  . Fixed incorrect reference counting. (Dmitry, Tianfang Yang)
 -
  - litespeed:
    . Fixed bug #75248 (Binary directory doesn't get created when building 
      only litespeed SAPI). (petk)