From: Joe Watkins <krakjoe@php.net>
Date: Thu, 19 Oct 2017 11:03:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b679435012a6eef8599d74e3edb5f4fbcff60d2;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
---

4b679435012a6eef8599d74e3edb5f4fbcff60d2
diff --cc NEWS
index cc519184bd,8f9e1b6968..ace518f923
--- a/NEWS
+++ b/NEWS
@@@ -19,17 -19,10 +19,19 @@@ PH
    . Fixed bug #75301 (Exif extension has built in revision version). (Peter
      Kokot)
  
 -- intl:
 +- Fileinfo:
 +  . Upgrade bundled libmagic to 5.31. (Anatol)
 +
 +- Intl:
 +  . Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change
 +    $position argument). (Laruence)
+   . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead 
+     of destination). (andrewnester)
  
 +- JSON:
 +  . Fixed bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null
 +    key). (Jakub Zelenka)
 +
  - OCI8:
    . Fixed valgrind issue. (Tianfang Yang)