php · TimWolla · Apr 12, 2024 · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024
diff --git a/NEWS b/NEWS
@@ -19,6 +19,7 @@ PHP                                                                        NEWS
   . Added sparc64 arch assembly support for zend fiber. (Claudio Jeker)
   . Fixed GH-13581 no space available for TLS on NetBSD. (Paul Ripke)
   . Added fiber Sys-V loongarch64 support. (qiangxuhui)
+  . Adjusted closure names to include the parent function's name. (timwolla)
 
 - Curl:
   . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)

diff --git a/UPGRADING b/UPGRADING
@@ -172,6 +172,8 @@ PHP 8.4 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/rfc1867-non-post
   . Getting the debug info for WeakReference will now also output the object
     it references, or null if the reference is no longer valid.
+  . The output of Closure::__debugInfo() now includes the name, file, and line
+    of the Closure.
 
 - Curl:
   . curl_version() returns an additional feature_list value, which is an
@@ -620,6 +622,10 @@ PHP 8.4 UPGRADE NOTES
 13. Other Changes
 ========================================
 
+* Closure names have been adjusted to include the parent function's name
+  and the line of definition to make them easier to distinguish, for example
+  within stack traces.
+
 ========================================
 14. Performance Improvements
 ========================================

diff --git a/Zend/tests/arrow_functions/006.phpt b/Zend/tests/arrow_functions/006.phpt
@@ -32,7 +32,7 @@ try {
 --EXPECTF--
 int(2)
 int(10)
-{closure}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d
+{closure:%s:%d}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d
 array(3) {
   [0]=>
   int(20)
@@ -41,4 +41,4 @@ array(3) {
   [2]=>
   int(30)
 }
-{closure}(): Argument #2 must be of type ?int, string given, called in %s on line %d
+{closure:%s:%d}(): Argument #2 must be of type ?int, string given, called in %s on line %d
diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt
@@ -12,8 +12,8 @@ spl_autoload_register(function ($name) {
 var_dump(class_exists('NotExistingClass'));
 
 ?>
---EXPECT--
-{closure}(NotExistingClass)
+--EXPECTF--
+{closure:%s:%d}(NotExistingClass)
 bool(false)
-{closure}(NotExistingClass), done
+{closure:%s:%d}(NotExistingClass), done
 bool(false)
diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt
@@ -37,11 +37,11 @@ while($test++ < 5)
 ?>
 ===DONE===
 --EXPECTF--
-{closure}(Test1,1)
+{closure:%s:%d}(Test1,1)
 Caught: Test1::__construct
-{closure}(Test2,2)
-Caught: {closure}
-{closure}(Test3,3)
+{closure:%s:%d}(Test2,2)
+Caught: {closure:%s:%d}
+{closure:%s:%d}(Test3,3)
 
 Fatal error: Uncaught Error: Class "Test3" not found in %s:%d
 Stack trace:

diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt
@@ -29,7 +29,7 @@ string(3) "Bar"
 
 Fatal error: Uncaught Exception: Bar in %s:%d
 Stack trace:
-#0 %s(%d): {closure}('Bar')
-#1 %s(%d): {closure}('Foo')
+#0 %s(%d): {closure:%s:%d}('Bar')
+#1 %s(%d): {closure:%s:%d}('Foo')
 #2 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug52193.phpt b/Zend/tests/bug52193.phpt
@@ -35,43 +35,85 @@ array(0) {
 }
 array(1) {
   [0]=>
-  object(Closure)#%d (0) {
+  object(Closure)#%d (3) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
   }
 }
 int(2)
 array(1) {
   [0]=>
-  object(Closure)#%d (1) {
+  object(Closure)#%d (4) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
     ["static"]=>
     array(1) {
       ["h"]=>
       &array(1) {
         [0]=>
-        object(Closure)#%d (0) {
+        object(Closure)#%d (3) {
+          ["name"]=>
+          string(%d) "{closure:%s:%d}"
+          ["file"]=>
+          string(%d) "%s"
+          ["line"]=>
+          int(%d)
         }
       }
     }
   }
 }
-object(Closure)#%d (1) {
+object(Closure)#%d (4) {
+  ["name"]=>
+  string(%d) "{closure:%s:%d}"
+  ["file"]=>
+  string(%d) "%s"
+  ["line"]=>
+  int(%d)
   ["static"]=>
   array(1) {
     ["h"]=>
     &array(1) {
       [0]=>
-      object(Closure)#%d (0) {
+      object(Closure)#%d (3) {
+        ["name"]=>
+        string(%d) "{closure:%s:%d}"
+        ["file"]=>
+        string(%d) "%s"
+        ["line"]=>
+        int(%d)
       }
     }
   }
 }
 array(1) {
   [0]=>
-  object(Closure)#%d (0) {
+  object(Closure)#%d (3) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
   }
 }
 array(2) {
   [0]=>
-  object(Closure)#%d (0) {
+  object(Closure)#%d (3) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
   }
   [1]=>
   int(5)

diff --git a/Zend/tests/bug60738.phpt b/Zend/tests/bug60738.phpt
@@ -16,7 +16,13 @@ trigger_error('Error!');
 --EXPECTF--
 NULL
 Intercepted error!
-object(Closure)#1 (0) {
+object(Closure)#%d (3) {
+  ["name"]=>
+  string(%d) "{closure:%s:%d}"
+  ["file"]=>
+  string(%d) "%s"
+  ["line"]=>
+  int(%d)
 }
 
 Notice: Error! in %s on line %d
diff --git a/Zend/tests/bug60738_variation.phpt b/Zend/tests/bug60738_variation.phpt
@@ -13,7 +13,13 @@ throw new Exception('Exception!');
 ?>
 --EXPECTF--
 NULL
-object(Closure)#1 (0) {
+object(Closure)#%d (3) {
+  ["name"]=>
+  string(%d) "{closure:%s:%d}"
+  ["file"]=>
+  string(%d) "%s"
+  ["line"]=>
+  int(%d)
 }
 
 Fatal error: Uncaught Exception: Exception! in %s:%d

diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/bug60909_1.phpt
@@ -14,7 +14,7 @@ require 'notfound.php';
 error(require(notfound.php): Failed to open stream: %s)
 Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5
 Stack trace:
-#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8)
+#0 %s(%d): {closure:%s:%d}(2, 'require(notfoun...', '%s', 8)
 #1 %sbug60909_1.php(8): require()
 #2 {main}
   thrown in %sbug60909_1.php on line 5

diff --git a/Zend/tests/bug61273.phpt b/Zend/tests/bug61273.phpt
@@ -12,5 +12,5 @@ call_user_func_array(function(&$a) {}, $args);
 echo strval("okey");
 ?>
 --EXPECTF--
-Warning: {closure}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
 okey
diff --git a/Zend/tests/bug61767.phpt b/Zend/tests/bug61767.phpt
@@ -20,14 +20,18 @@ Error handler called (Undefined variable $undefined)
 
 Fatal error: Uncaught ErrorException: Undefined variable $undefined in %sbug61767.php:%d
 Stack trace:
-#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d)
+#0 %s(%d): {closure:%s:%d}(2, 'Undefined varia...', '%s', 13)
 #1 {main}
   thrown in %sbug61767.php on line %d
 Shutting down
 Array
 (
     [type] => 1
-    [message] => %a
+    [message] => Uncaught ErrorException: Undefined variable $undefined in %s:%d
+Stack trace:
+#0 %s(%d): {closure:%s:%d}(2, 'Undefined varia...', '%s', 13)
+#1 {main}
+  thrown
     [file] => %sbug61767.php
     [line] => %d
 )
diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt
@@ -37,7 +37,7 @@ Deprecated: Creation of dynamic property Exception::$_trace is deprecated in %s
 
 Fatal error: Uncaught Exception in %sbug64960.php:19
 Stack trace:
-#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9)
+#0 [internal function]: {closure:%s:%d}(8, 'ob_end_clean():...', '%s', 9)
 #1 %sbug64960.php(9): ob_end_clean()
 #2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
 #3 {main}

diff --git a/Zend/tests/bug67856.phpt b/Zend/tests/bug67856.phpt
@@ -8,15 +8,15 @@ var_dump(array_reduce($array, function(&$a, &$b) {
 }, 0));
 ?>
 --EXPECTF--
-Warning: {closure}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
 
-Warning: {closure}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
 
-Warning: {closure}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
 
-Warning: {closure}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
 
-Warning: {closure}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d
 
-Warning: {closure}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
+Warning: {closure:%s:%d}(): Argument #2 ($b) must be passed by reference, value given in %s on line %d
 int(6)
diff --git a/Zend/tests/bug70321.phpt b/Zend/tests/bug70321.phpt
@@ -39,11 +39,23 @@ var_dump($foo->bar->onBaz);
 --EXPECTF--
 array(1) {
   [0]=>
-  object(Closure)#%d (0) {
+  object(Closure)#%d (3) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
   }
 }
 array(1) {
   [0]=>
-  object(Closure)#%d (0) {
+  object(Closure)#%d (3) {
+    ["name"]=>
+    string(%d) "{closure:%s:%d}"
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
   }
 }
diff --git a/Zend/tests/bug72101.phpt b/Zend/tests/bug72101.phpt
@@ -78,7 +78,7 @@ $foo->bar($a, $b, $c);
 --EXPECTF--
 Fatal error: Uncaught Error: Class "DoesNotExists" not found in %s:%d
 Stack trace:
-#0 %sbug72101.php(%d): {closure}(2, 'MethodCallbackB...', '%s', 8)
+#0 %s(%d): {closure:%s:%d}(2, 'MethodCallbackB...', '%s', 8)
 #1 %sbug72101.php(%d): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #2 %sbug72101.php(%d): PHPUnit_Framework_MockObject_Matcher->invoked(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #3 %sbug72101.php(%d): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))

diff --git a/Zend/tests/bug74164.phpt b/Zend/tests/bug74164.phpt
@@ -12,9 +12,9 @@ set_error_handler(function ($type, $msg) {
 call_user_func(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable');
 ?>
 --EXPECTF--
-Fatal error: Uncaught Exception: Foo\{closure}(): Argument #1 ($ref) must be passed by reference, value given in %s:%d
+Fatal error: Uncaught Exception: {closure:%s:%d}(): Argument #1 ($ref) must be passed by reference, value given in %s:%d
 Stack trace:
-#0 [internal function]: Foo\{closure}(%s)
+#0 [internal function]: {closure:%s:%d}(2, '%s', '%s', 9)
 #1 %sbug74164.php(%d): call_user_func(%s)
 #2 {main}
   thrown in %sbug74164.php on line %d
diff --git a/Zend/tests/bug75079_2.phpt b/Zend/tests/bug75079_2.phpt
@@ -31,6 +31,6 @@ int(123)
 
 Fatal error: Uncaught Error: Cannot access private property Foo::$bar in %s:%d
 Stack trace:
-#0 %s(%d): A->{closure}()
+#0 %s(%d): A->{closure:%s:%d}()
 #1 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug75290.phpt b/Zend/tests/bug75290.phpt
@@ -8,8 +8,8 @@ var_dump((new ReflectionFunction('sin'))->getClosure());
 var_dump(function ($someThing) {});
 
 ?>
---EXPECT--
-object(Closure)#2 (2) {
+--EXPECTF--
+object(Closure)#%d (2) {
   ["function"]=>
   string(3) "sin"
   ["parameter"]=>
@@ -18,7 +18,13 @@ object(Closure)#2 (2) {
     string(10) "<required>"
   }
 }
-object(Closure)#2 (1) {
+object(Closure)#%d (4) {
+  ["name"]=>
+  string(%d) "{closure:%s:%d}"
+  ["file"]=>
+  string(%d) "%s"
+  ["line"]=>
+  int(%d)
   ["parameter"]=>
   array(1) {
     ["$someThing"]=>

diff --git a/Zend/tests/bug76534.phpt b/Zend/tests/bug76534.phpt
@@ -12,6 +12,6 @@ $y = &$x["2bar"];
 --EXPECTF--
 Fatal error: Uncaught Exception: Illegal string offset "2bar" in %s:%d
 Stack trace:
-#0 %sbug76534.php(%d): {closure}(2, 'Illegal string ...', '%s', %d)
+#0 %s(%d): {closure:%s:%d}(2, 'Illegal string ...', '%s', 7)
 #1 {main}
   thrown in %sbug76534.php on line %d
diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/bug79657.phpt
@@ -36,7 +36,7 @@ get(...loop());
 Fatal error: Uncaught Exception in %s:%d
 Stack trace:
 #0 %s(%d): throwException()
-#1 %s(%d): {closure}()
+#1 %s(%d): {closure:%s:%d}()
 #2 %s(%d): loop()
 #3 {main}
   thrown in %s on line %d