Variable name + tests

Author: DanielEScherzer

Zend/tests/concat/bug79836.phpt

@@ -8,16 +8,12 @@ $counter = 0;
 ob_start(function ($buffer) use (&$c, &$counter) {
 	$c = 0;
 	++$counter;
+	return '';
 }, 1);
 $c .= [];
 $c .= [];
 ob_end_clean();
 echo $counter . "\n";
 ?>
---EXPECTF--
-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:%s:%d} 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
+--EXPECT--
 3

Zend/tests/concat/bug79836_1.phpt

@@ -7,15 +7,13 @@ opcache.optimization_level = 0x7FFEBFFF & ~0x400
 $x = 'non-empty';
 ob_start(function () use (&$c) {
 	$c = 0;
+	return '';
 }, 1);
 $c = [];
 $x = $c . $x;
 $x = $c . $x;
 ob_end_clean();
 echo "Done\n";
 ?>
---EXPECTF--
-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:%s:%d} is deprecated in %s on line %d
+--EXPECT--
 Done

Zend/tests/concat/bug79836_2.phpt

@@ -6,6 +6,7 @@ $c = str_repeat("abcd", 10);
 
 ob_start(function () use (&$c) {
 	$c = 0;
+	return '';
 }, 1);
 
 class X {
@@ -21,8 +22,5 @@ $x = $c . $xxx;
 ob_end_clean();
 echo $x . "\n";
 ?>
---EXPECTF--
-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:%s:%d} is deprecated in %s on line %d
+--EXPECT--
 abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabc

Zend/tests/declare/gh18033_2.phpt

@@ -11,7 +11,7 @@ ob_start(function() {
     register_tick_function(
        function() { }
     );
+    return '';
 });
 ?>
---EXPECTF--
-Deprecated: PHP Request Shutdown: Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
+--EXPECT--

Zend/tests/gh11189.phpt

@@ -18,6 +18,7 @@ ob_start(function() {
         $a[] = 2;
     }
     fwrite(STDOUT, "Success");
+    return '';
 });
 
 $a = [];
@@ -29,6 +30,4 @@ while (1) {
 ?>
 --EXPECTF--
 Success
-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

@@ -18,6 +18,7 @@ ob_start(function() {
         $a[] = 2;
     }
     fwrite(STDOUT, "Success");
+    return '';
 });
 
 $a = ["not packed" => 1];
@@ -29,6 +30,4 @@ while (1) {
 ?>
 --EXPECTF--
 Success
-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

@@ -6,16 +6,12 @@ $counter = 0;
 ob_start(function ($buffer) use (&$c, &$counter) {
         $c = 0;
         ++$counter;
+        return '';
 }, 1);
 $c .= [];
 $c .= [];
 ob_end_clean();
 echo $counter . "\n";
 ?>
---EXPECTF--
-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:%s:%d} 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
+--EXPECT--
 3

ext/session/tests/user_session_module/bug61728.phpt

@@ -5,7 +5,7 @@ session
 --FILE--
 <?php
 function output_html($ext) {
-    return strlen($ext);
+    return (string)strlen($ext);
 }
 
 class MySessionHandler implements SessionHandlerInterface {
@@ -40,6 +40,5 @@ class MySessionHandler implements SessionHandlerInterface {
 session_set_save_handler(new MySessionHandler());
 session_start();
 ?>
---EXPECTF--
-Deprecated: ob_end_flush(): Returning a non-string result from user output handler output_html is deprecated in %s on line %d
+--EXPECT--
 8

main/output.c

@@ -1270,8 +1270,8 @@ static int php_output_stack_pop(int flags)
 		int handler_count = php_output_get_level();
 		if (handler_count) {
 			php_output_handler **handlers = (php_output_handler **) zend_stack_base(&OG(handlers));
-			for (int iii = 0; iii < handler_count; ++iii) {
-				php_output_handler *curr_handler = handlers[iii];
+			for (int handler_num = 0; handler_num < handler_count; ++handler_num) {
+				php_output_handler *curr_handler = handlers[handler_num];
 				if (curr_handler == orphan) {
 					still_have_handler = true;
 					break;

sapi/cli/tests/gh8827-002.phpt

@@ -18,6 +18,7 @@ $stderr = fopen('php://stderr', 'r');
 
 ob_start(function ($buffer) use ($stdout) {
     fwrite($stdout, $buffer);
+	return '';
 }, 1);
 
 print "STDIN:\n";
@@ -32,20 +33,10 @@ print "STDOUT:\n";
 fclose(STDOUT);
 var_dump(@fopen('php://stdout', 'a'));
 ?>
---EXPECTF--
+--EXPECT--
 STDIN:
-
-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:%s:%d} is deprecated in %s on line %d
 STDERR:
-
-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:%s:%d} is deprecated in %s on line %d
 STDOUT:
-
-Deprecated: main(): Returning a non-string result from user output handler {closure:%s:%d} is deprecated in %s on line %d
 bool(false)