From: Nikita Popov <nikic@php.net>
Date: Tue, 30 Aug 2016 11:06:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d49024c6ded6eea1f73bed895716b8494ea7b440;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

d49024c6ded6eea1f73bed895716b8494ea7b440
diff --cc NEWS
index c18f87f7d7,4c21c43677..ec64fc53da
--- a/NEWS
+++ b/NEWS
@@@ -53,10 -78,13 +53,12 @@@ PH
  
  - SimpleXML:
    . Fixed bug #72971 (SimpleXML isset/unset do not respect namespace). (Nikita)
+   . Fixed bug #72957 (Null coalescing operator doesn't behave as expected with
+     SimpleXMLElement). (Nikita)
  
  - Standard:
 -  . Fixed bug #55451 (substr_compare NULL length interpreted as 0). (Lauri
 -    Kenttä)
 -  . Fixed bug #72278 (getimagesize returning FALSE on valid jpg). (cmb)
 +  . Fixed bug #72920 (Accessing a private constant using constant() creates
 +    an exception AND warning). (Laruence)
    . Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign).
      (cmb)
    . Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).