More test fixes

Author: DanielEScherzer

Zend/tests/concat/bug79836.phpt

@@ -15,9 +15,9 @@ ob_end_clean();
 echo $counter . "\n";
 ?>
 --EXPECTF--
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: ob_end_clean(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: ob_end_clean(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 3

Zend/tests/concat/bug79836_1.phpt

@@ -15,7 +15,7 @@ ob_end_clean();
 echo "Done\n";
 ?>
 --EXPECTF--
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: ob_end_clean(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: ob_end_clean(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 Done

Zend/tests/concat/bug79836_2.phpt

@@ -22,7 +22,7 @@ ob_end_clean();
 echo $x . "\n";
 ?>
 --EXPECTF--
-Deprecated: X::__toString(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: X::__toString(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: ob_end_clean(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: ob_end_clean(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabc

Zend/tests/declare/gh18033_2.phpt

@@ -14,4 +14,4 @@ ob_start(function() {
 });
 ?>
 --EXPECTF--
-Deprecated: PHP Request Shutdown: Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: PHP Request Shutdown: Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d

Zend/tests/gh11189.phpt

@@ -29,6 +29,6 @@ while (1) {
 ?>
 --EXPECTF--
 Success
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
 Fatal error: Allowed memory size of %s bytes exhausted%s(tried to allocate %s bytes) in %s on line %d

Zend/tests/gh11189_1.phpt

@@ -29,6 +29,6 @@ while (1) {
 ?>
 --EXPECTF--
 Success
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
 Fatal error: Allowed memory size of %s bytes exhausted%s(tried to allocate %s bytes) in %s on line %d

Zend/tests/gh16408.phpt

@@ -13,9 +13,9 @@ ob_end_clean();
 echo $counter . "\n";
 ?>
 --EXPECTF--
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 
-Deprecated: ob_end_clean(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: ob_end_clean(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 3

sapi/cli/tests/gh8827-002.phpt

@@ -35,17 +35,17 @@ var_dump(@fopen('php://stdout', 'a'));
 --EXPECTF--
 STDIN:
 
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 bool(false)
 
-Deprecated: var_dump(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: var_dump(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 STDERR:
 
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 bool(false)
 
-Deprecated: var_dump(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: var_dump(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 STDOUT:
 
-Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
+Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 bool(false)