Only disable the problematic output handler

And update tests

Zend/tests/concat/bug79836.phpt

@@ -14,5 +14,10 @@ $c .= [];
 ob_end_clean();
 echo $counter . "\n";
 ?>
---EXPECT--
+--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::__invoke 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
 3

Zend/tests/concat/bug79836_1.phpt

@@ -14,5 +14,8 @@ $x = $c . $x;
 ob_end_clean();
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: main(): 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::__invoke is deprecated in %s on line %d
 Done

Zend/tests/concat/bug79836_2.phpt

@@ -21,5 +21,8 @@ $x = $c . $xxx;
 ob_end_clean();
 echo $x . "\n";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: X::__toString(): 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::__invoke is deprecated in %s on line %d
 abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabc

Zend/tests/declare/gh18033_2.phpt

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

Zend/tests/gh11189.phpt

@@ -26,4 +26,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
+
 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

@@ -26,4 +26,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
+
 Fatal error: Allowed memory size of %s bytes exhausted%s(tried to allocate %s bytes) in %s on line %d

Zend/tests/gh16408.phpt

@@ -12,5 +12,10 @@ $c .= [];
 ob_end_clean();
 echo $counter . "\n";
 ?>
---EXPECT--
+--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::__invoke 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
 3

ext/session/tests/user_session_module/bug61728.phpt

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

main/output.c

@@ -962,16 +962,16 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
 
 			if (SUCCESS == zend_call_function(&handler->func.user->fci, &handler->func.user->fcc) && Z_TYPE(retval) != IS_UNDEF) {
 				if (Z_TYPE(retval) != IS_STRING) {
-					// Make sure that we don't get lost in an output buffer
-					int old_flags = OG(flags);
-					OG(flags) = old_flags & (~PHP_OUTPUT_ACTIVATED);
+					// Make sure that we don't get lost in the current output buffer
+					// by disabling it
+					handler->flags |= PHP_OUTPUT_HANDLER_DISABLED;
 					php_error_docref(
 						NULL,
 						E_DEPRECATED,
 						"Returning a non-string result from user output handler %s is deprecated",
 						ZSTR_VAL(handler->name)
 					);
-					OG(flags) = old_flags;
+					handler->flags &= (~PHP_OUTPUT_HANDLER_DISABLED);
 				}
 				if (Z_TYPE(retval) == IS_FALSE) {
 					/* call failed, pass internal buffer along */

sapi/cli/tests/gh8827-002.phpt

@@ -32,10 +32,20 @@ print "STDOUT:\n";
 fclose(STDOUT);
 var_dump(@fopen('php://stdout', 'a'));
 ?>
---EXPECT--
+--EXPECTF--
 STDIN:
+
+Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke 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
 STDERR:
+
+Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke 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
 STDOUT:
+
+Deprecated: main(): Returning a non-string result from user output handler Closure::__invoke is deprecated in %s on line %d
 bool(false)

tests/output/ob_start_basic_002.phpt

@@ -40,18 +40,19 @@ foreach ($callbacks as $callback) {
 
 
 --> Use callback 'return_false':
-My output.
-Deprecated: ob_end_flush(): Returning a non-string result from user output handler return_false is deprecated in %s on line %d
 
+Deprecated: ob_end_flush(): Returning a non-string result from user output handler return_false is deprecated in %s on line %d
+My output.
 
 --> Use callback 'return_null':
 
+Deprecated: ob_end_flush(): Returning a non-string result from user output handler return_null is deprecated in %s on line %d
 
 
-Deprecated: ob_end_flush(): Returning a non-string result from user output handler return_null is deprecated in %s on line %d
 --> Use callback 'return_string':
 I stole your output.
 
 --> Use callback 'return_zero':
-0
+
 Deprecated: ob_end_flush(): Returning a non-string result from user output handler return_zero is deprecated in %s on line %d
+0