From: Aaron Piotrowski <aaron@trowski.com>
Date: Tue, 23 Aug 2016 16:49:57 +0000 (-0500)
Subject: Remove accidental NEWS and UPGRADING entries
X-Git-Tag: php-7.2.0alpha1~1443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dccadaac6fe633e2467eb0b46b06dbf3b43cff0;p=php

Remove accidental NEWS and UPGRADING entries

Merge mistake from PHP-7.1.
---

diff --git a/NEWS b/NEWS
index 748c9dd00e..a91137ea8d 100644
--- a/NEWS
+++ b/NEWS
@@ -29,9 +29,5 @@ PHP                                                                        NEWS
   . Implemented request #69086 (enhancement for mb_convert_encoding() that
     handles multibyte replacement char nicely) (Masakielastic, Yasuo)
 
-- Reflection:
-  . Reverted prepending \ for class names and ? for nullable types returned
-    from ReflectionType::__toString(). (Trowski)
-
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
 
diff --git a/UPGRADING b/UPGRADING
index 3dc2c1e459..c89f46d5cf 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -25,11 +25,6 @@ PHP 7.1 UPGRADE NOTES
   . is_object() will now return true for objects of class
     __PHP_Incomplete_Class.
 
-- Reflection:
-  . ReflectionNamedType will be returned from ReflectionParameter::getType()
-    and ReflectionFunctionAbstract::getReturnType(). This class includes a
-    getName() method that returns the type name as a string.
-
 ========================================
 2. New Features
 ========================================