From: Joe Watkins <krakjoe@php.net>
Date: Mon, 21 Oct 2019 07:24:57 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=174ab25fd47d9bc0f370419eeb12e4b4e4f6084f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #78697: inaccurate error message
---

174ab25fd47d9bc0f370419eeb12e4b4e4f6084f
diff --cc NEWS
index 753fa5806c,2e7984985a..f914d9d264
--- a/NEWS
+++ b/NEWS
@@@ -58,13 -485,12 +58,17 @@@ PH
      (krakjoe)
    . Fixed bug #77805 (phpdbg build fails when readline is shared). (krakjoe)
  
 -- SimpleXML:
 -  . Implemented FR #65215 (SimpleXMLElement could register as implementing
 -    Countable). (LeSuisse)
++- Reflection:
++  . Fixed bug #78697 (ReflectionClass::implementsInterface - inaccurate error 
++    message with traits). (villfa)
+ 
 -- Sockets:
 -  . Fixed bug #67619 (Validate length on socket_write). (thiagooak)
 +- Session:
 +  . Fixed bug #78624 (session_gc return value for user defined session
 +    handlers). (bshaffer)
 +
 +- SimpleXML:
 +  . Fixed bug #75245 (Don't set content of elements with only whitespaces).
 +    (eriklundin)
  
  - sodium:
    . Fixed bug #77646 (sign_detached() strings not terminated). (Frank)