From: Joe Watkins <krakjoe@php.net>
Date: Mon, 6 Nov 2017 07:19:00 +0000 (+0000)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1084
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18c833504f891b194a873225771b831420fad377;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Mention spl_object_id in UPGRADING notes
---

18c833504f891b194a873225771b831420fad377
diff --cc UPGRADING
index 7aa446b1f3,ed8d84cd25..d19780c525
--- a/UPGRADING
+++ b/UPGRADING
@@@ -71,23 -236,41 +71,26 @@@ Standard
  6. New Functions
  ========================================
  
 -- Core:
 -  . Added stream_isatty().
 -  . Added sapi_windows_vt100_support().
 -
 -- DOM:
 -  . DomNodeList implements Countable, added DomNodeList::count().
 -  . DOMNamedNodeMap implements Countable, added DOMNamedNodeMap::count().
 -
 -- FTP:
 -  . Added ftp_append().
 -
 -- GD:
 -  . Added imagesetclip() and imagegetclip().
 -  . Added imageopenpolygon().
 -  . Added imageresolution().
 -  . Added imagecreatefrombmp() and imagebmp().
 -
 -- Hash:
 -  . Added hash_hmac_algos().
 -
 -- Mbstring:
 -  . Added mb_chr() and mb_ord().
 -  . Added mb_scrub() that scrubs broken multibyte strings.
 -
 -- OCI8:
 -  . Added oci_register_taf_callback() and oci_disable_taf_callback() for
 -    Oracle Database TAF callback support.
 -
 -- Sockets:
 -  . Added socket_addrinfo_lookup(), socket_addrinfo_connect(),
 -    socket_addrinfo_bind() and socket_addrinfo_explain().
 -
 -- SPL:
 +Date:
 +  . Added the DateTime::createFromImmutable() method, which mirrors
 +    DateTimeImmutable::createFromMutable().
 +
 +Intl:
 +  . Added void Spoofchecker::setRestrictionLevel(int $level) method, available
 +    when linked with ICU >= 58.1. Levels are represented as class constants
 +    - Spoofchecker::ASCII
 +    - Spoofchecker::HIGHLY_RESTRICTIVE
 +    - Spoofchecker::MODERATELY_RESTRICTIVE
 +    - Spoofchecker::MINIMALLY_RESTRICTIVE
 +    - Spoofchecker::UNRESTRICTIVE
 +    - Spoofchecker::SINGLE_SCRIPT_RESTRICTIVE
 +    For the detailed documentation on the restriction levels, see
 +    URestrictionLevel under
 +    http://icu-project.org/apiref/icu4c/uspoof_8h.html
 +
++SPL:
+   . Added spl_object_id().
+ 
  ========================================
  7. New Classes and Interfaces
  ========================================