From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 16 Nov 2020 13:33:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c351768e4f6f7061669723fee83c085e631f30d5;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #74558: Can't rebind closure returned by Closure::fromCallable()
---

c351768e4f6f7061669723fee83c085e631f30d5
diff --cc NEWS
index dca15b5ccf,747a354855..d22439251f
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,24 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.4.14
 +?? ??? ????, PHP 8.0.0
  
+ - Core:
+   . Fixed bug #74558 (Can't rebind closure returned by Closure::fromCallable()).
+     (cmb)
  
 -26 Nov 2020, PHP 7.4.13
 +12 Nov 2020, PHP 8.0.0RC4
  
  - Core:
 -  . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
 -    (cmb)
 -  . Fixed bug #80258 (Windows Deduplication Enabled, randon permission errors).
 -    (cmb)
 -
 -- COM:
 -  . Fixed bug #62474 (com_event_sink crashes on certain arguments). (cmb)
 -
 -- DOM:
 -  . Fixed bug #80268 (loadHTML() truncates at NUL bytes). (cmb)
 +  . Fixed bug #80334 (assert() vs named parameters - confusing error). (Nikita)
  
  - FFI:
    . Fixed bug #79177 (FFI doesn't handle well PHP exceptions within callback).
diff --cc Zend/tests/closure_061.phpt
index 2c574c49c0,41863fd0c0..240f22e036
--- a/Zend/tests/closure_061.phpt
+++ b/Zend/tests/closure_061.phpt
@@@ -208,16 -210,16 +208,16 @@@ bindTo(new ClsUnrelated, SplDoublyLinke
  Cannot bind method SplDoublyLinkedList::count() to object of class ClsUnrelated
  
  bindTo(null, null):
 -Cannot unbind $this of internal method
 +Cannot unbind $this of method
  
  bindTo(null, SplDoublyLinkedList::class):
 -Cannot unbind $this of internal method
 +Cannot unbind $this of method
  
  bindTo(new SplDoublyLinkedList, null):
- Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure()
+ Cannot rebind scope of closure created from method
  
  bindTo(new SplDoublyLinkedList, ClsUnrelated::class):
- Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure()
+ Cannot rebind scope of closure created from method
  
  (function() {})()
  -----------------