From ed041c34435f94fc60934dba12283bd361ae6011 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Tue, 2 Apr 2024 18:11:02 +0200
Subject: [PATCH] Partial backport of e7462bf

e7462bff19228162a21ccc6dd248b0dbffc15517
---
 ext/opcache/tests/jit/ignored_opcodes.phpt              | 1 +
 ext/zend_test/tests/observer_backtrace_01.phpt          | 1 +
 ext/zend_test/tests/observer_basic_01.phpt              | 1 +
 ext/zend_test/tests/observer_basic_02.phpt              | 1 +
 ext/zend_test/tests/observer_basic_03.phpt              | 1 +
 ext/zend_test/tests/observer_basic_04.phpt              | 1 +
 ext/zend_test/tests/observer_basic_05.phpt              | 1 +
 ext/zend_test/tests/observer_bug81430_1.phpt            | 1 +
 ext/zend_test/tests/observer_bug81430_2.phpt            | 1 +
 ext/zend_test/tests/observer_bug81435.phpt              | 1 +
 ext/zend_test/tests/observer_call_user_func_01.phpt     | 1 +
 ext/zend_test/tests/observer_call_user_func_02.phpt     | 1 +
 ext/zend_test/tests/observer_call_user_func_03.phpt     | 1 +
 ext/zend_test/tests/observer_call_user_func_04.phpt     | 1 +
 ext/zend_test/tests/observer_closure_01.phpt            | 1 +
 ext/zend_test/tests/observer_closure_02.phpt            | 1 +
 ext/zend_test/tests/observer_error_01.phpt              | 1 +
 ext/zend_test/tests/observer_error_02.phpt              | 1 +
 ext/zend_test/tests/observer_error_03.phpt              | 1 +
 ext/zend_test/tests/observer_error_04.phpt              | 1 +
 ext/zend_test/tests/observer_error_05.phpt              | 1 +
 ext/zend_test/tests/observer_eval_01.phpt               | 1 +
 ext/zend_test/tests/observer_exception_01.phpt          | 1 +
 ext/zend_test/tests/observer_fiber_01.phpt              | 1 +
 ext/zend_test/tests/observer_fiber_02.phpt              | 1 +
 ext/zend_test/tests/observer_fiber_03.phpt              | 1 +
 ext/zend_test/tests/observer_fiber_04.phpt              | 1 +
 ext/zend_test/tests/observer_fiber_05.phpt              | 1 +
 ext/zend_test/tests/observer_fiber_06.phpt              | 1 +
 ext/zend_test/tests/observer_generator_01.phpt          | 1 +
 ext/zend_test/tests/observer_generator_02.phpt          | 1 +
 ext/zend_test/tests/observer_generator_03.phpt          | 1 +
 ext/zend_test/tests/observer_generator_04.phpt          | 1 +
 ext/zend_test/tests/observer_generator_05.phpt          | 1 +
 ext/zend_test/tests/observer_magic_01.phpt              | 1 +
 ext/zend_test/tests/observer_opline_01.phpt             | 1 +
 ext/zend_test/tests/observer_retval_01.phpt             | 1 +
 ext/zend_test/tests/observer_retval_02.phpt             | 1 +
 ext/zend_test/tests/observer_retval_03.phpt             | 1 +
 ext/zend_test/tests/observer_retval_04.phpt             | 1 +
 ext/zend_test/tests/observer_retval_05.phpt             | 1 +
 ext/zend_test/tests/observer_retval_06.phpt             | 1 +
 ext/zend_test/tests/observer_retval_07.phpt             | 1 +
 ext/zend_test/tests/observer_retval_by_ref_01.phpt      | 1 +
 ext/zend_test/tests/observer_retval_by_ref_02.phpt      | 1 +
 ext/zend_test/tests/observer_retval_by_ref_03.phpt      | 1 +
 ext/zend_test/tests/observer_shutdown_01.phpt           | 1 +
 ext/zend_test/tests/observer_shutdown_02.phpt           | 1 +
 ext/zend_test/tests/observer_types_01.phpt              | 1 +
 ext/zend_test/tests/observer_zend_call_function_01.phpt | 1 +
 50 files changed, 50 insertions(+)

diff --git a/ext/opcache/tests/jit/ignored_opcodes.phpt b/ext/opcache/tests/jit/ignored_opcodes.phpt
index 39816c5d4b3..ca0730f8b94 100644
--- a/ext/opcache/tests/jit/ignored_opcodes.phpt
+++ b/ext/opcache/tests/jit/ignored_opcodes.phpt
@@ -8,6 +8,7 @@ opcache.jit_buffer_size=1M
 opcache.jit=function
 ;opcache.jit_debug=257
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_opcode_in_user_handler=ZEND_EXIT, ZEND_BEGIN_SILENCE, ZEND_END_SILENCE
 --EXTENSIONS--
diff --git a/ext/zend_test/tests/observer_backtrace_01.phpt b/ext/zend_test/tests/observer_backtrace_01.phpt
index 875a04c395f..d0b1078cc36 100644
--- a/ext/zend_test/tests/observer_backtrace_01.phpt
+++ b/ext/zend_test/tests/observer_backtrace_01.phpt
@@ -4,6 +4,7 @@ Observer: Show backtrace on init
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_init_backtrace=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_basic_01.phpt b/ext/zend_test/tests/observer_basic_01.phpt
index 369339fb77c..cef6d138239 100644
--- a/ext/zend_test/tests/observer_basic_01.phpt
+++ b/ext/zend_test/tests/observer_basic_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_02.phpt b/ext/zend_test/tests/observer_basic_02.phpt
index adbdc781815..5a93a25ff6a 100644
--- a/ext/zend_test/tests/observer_basic_02.phpt
+++ b/ext/zend_test/tests/observer_basic_02.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland methods
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_03.phpt b/ext/zend_test/tests/observer_basic_03.phpt
index f98390a0c98..3d60550ce60 100644
--- a/ext/zend_test/tests/observer_basic_03.phpt
+++ b/ext/zend_test/tests/observer_basic_03.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of includes
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_04.phpt b/ext/zend_test/tests/observer_basic_04.phpt
index 1b55f6da3d2..0ff88051fbc 100644
--- a/ext/zend_test/tests/observer_basic_04.phpt
+++ b/ext/zend_test/tests/observer_basic_04.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of includes only (no functions)
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_includes=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_05.phpt b/ext/zend_test/tests/observer_basic_05.phpt
index 1891cd87ae4..f1fd8b5bbff 100644
--- a/ext/zend_test/tests/observer_basic_05.phpt
+++ b/ext/zend_test/tests/observer_basic_05.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of functions only (no includes)
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_functions=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81430_1.phpt b/ext/zend_test/tests/observer_bug81430_1.phpt
index cac53ef70cb..78d012699fa 100644
--- a/ext/zend_test/tests/observer_bug81430_1.phpt
+++ b/ext/zend_test/tests/observer_bug81430_1.phpt
@@ -5,6 +5,7 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81430_2.phpt b/ext/zend_test/tests/observer_bug81430_2.phpt
index 4d56248a80f..90e0fa5ce01 100644
--- a/ext/zend_test/tests/observer_bug81430_2.phpt
+++ b/ext/zend_test/tests/observer_bug81430_2.phpt
@@ -5,6 +5,7 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81435.phpt b/ext/zend_test/tests/observer_bug81435.phpt
index 2b78c509931..7b927e55fb1 100644
--- a/ext/zend_test/tests/observer_bug81435.phpt
+++ b/ext/zend_test/tests/observer_bug81435.phpt
@@ -5,6 +5,7 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_function_names=a,d
 opcache.optimization_level=0
 --FILE--
diff --git a/ext/zend_test/tests/observer_call_user_func_01.phpt b/ext/zend_test/tests/observer_call_user_func_01.phpt
index f4a25a03723..8e40f44c2ec 100644
--- a/ext/zend_test/tests/observer_call_user_func_01.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_01.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func() from root namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_02.phpt b/ext/zend_test/tests/observer_call_user_func_02.phpt
index 30a4b08f3fc..958348b151d 100644
--- a/ext/zend_test/tests/observer_call_user_func_02.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_02.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from root namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_03.phpt b/ext/zend_test/tests/observer_call_user_func_03.phpt
index 827730111f6..ed830c968f6 100644
--- a/ext/zend_test/tests/observer_call_user_func_03.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_03.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func() from namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_04.phpt b/ext/zend_test/tests/observer_call_user_func_04.phpt
index 7f516002aef..41b061cbab3 100644
--- a/ext/zend_test/tests/observer_call_user_func_04.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_04.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_closure_01.phpt b/ext/zend_test/tests/observer_closure_01.phpt
index c10b170337b..7f5a8c0bb84 100644
--- a/ext/zend_test/tests/observer_closure_01.phpt
+++ b/ext/zend_test/tests/observer_closure_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of closures
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_closure_02.phpt b/ext/zend_test/tests/observer_closure_02.phpt
index e9724405647..a80146e62eb 100644
--- a/ext/zend_test/tests/observer_closure_02.phpt
+++ b/ext/zend_test/tests/observer_closure_02.phpt
@@ -4,6 +4,7 @@ Observer: Observability of fake closures
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_error_01.phpt b/ext/zend_test/tests/observer_error_01.phpt
index 534e484c8a0..10b1e569b0f 100644
--- a/ext/zend_test/tests/observer_error_01.phpt
+++ b/ext/zend_test/tests/observer_error_01.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 memory_limit=2M
diff --git a/ext/zend_test/tests/observer_error_02.phpt b/ext/zend_test/tests/observer_error_02.phpt
index 426c345e750..ca303526d15 100644
--- a/ext/zend_test/tests/observer_error_02.phpt
+++ b/ext/zend_test/tests/observer_error_02.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_03.phpt b/ext/zend_test/tests/observer_error_03.phpt
index b9f5ae75cc0..4289d86089a 100644
--- a/ext/zend_test/tests/observer_error_03.phpt
+++ b/ext/zend_test/tests/observer_error_03.phpt
@@ -4,6 +4,7 @@ Observer: non-fatal errors do not fire end handlers prematurely
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_04.phpt b/ext/zend_test/tests/observer_error_04.phpt
index 40c18e22dff..7bed54eb34b 100644
--- a/ext/zend_test/tests/observer_error_04.phpt
+++ b/ext/zend_test/tests/observer_error_04.phpt
@@ -5,6 +5,7 @@ zend_test
 soap
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_05.phpt b/ext/zend_test/tests/observer_error_05.phpt
index 58a34096604..536d13be1b9 100644
--- a/ext/zend_test/tests/observer_error_05.phpt
+++ b/ext/zend_test/tests/observer_error_05.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_eval_01.phpt b/ext/zend_test/tests/observer_eval_01.phpt
index 7f9ff53acba..2b63c752d3c 100644
--- a/ext/zend_test/tests/observer_eval_01.phpt
+++ b/ext/zend_test/tests/observer_eval_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic eval observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_exception_01.phpt b/ext/zend_test/tests/observer_exception_01.phpt
index 19e90e0ac62..85ba9de85ce 100644
--- a/ext/zend_test/tests/observer_exception_01.phpt
+++ b/ext/zend_test/tests/observer_exception_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions with uncaught exceptions
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_01.phpt b/ext/zend_test/tests/observer_fiber_01.phpt
index bd657310160..61e03686f63 100644
--- a/ext/zend_test/tests/observer_fiber_01.phpt
+++ b/ext/zend_test/tests/observer_fiber_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic fiber switching
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_init=1
 zend_test.observer.fiber_switch=1
 zend_test.observer.fiber_destroy=1
diff --git a/ext/zend_test/tests/observer_fiber_02.phpt b/ext/zend_test/tests/observer_fiber_02.phpt
index 6e420ef0ea6..63bd2eeb862 100644
--- a/ext/zend_test/tests/observer_fiber_02.phpt
+++ b/ext/zend_test/tests/observer_fiber_02.phpt
@@ -4,6 +4,7 @@ Observer: Unfinished fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_03.phpt b/ext/zend_test/tests/observer_fiber_03.phpt
index 67699c25ae8..071c9f34a4b 100644
--- a/ext/zend_test/tests/observer_fiber_03.phpt
+++ b/ext/zend_test/tests/observer_fiber_03.phpt
@@ -4,6 +4,7 @@ Observer: Nested fibers
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_04.phpt b/ext/zend_test/tests/observer_fiber_04.phpt
index 3a72132f5b5..23d8b3b899c 100644
--- a/ext/zend_test/tests/observer_fiber_04.phpt
+++ b/ext/zend_test/tests/observer_fiber_04.phpt
@@ -4,6 +4,7 @@ Observer: Nested fibers with unfinished fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_05.phpt b/ext/zend_test/tests/observer_fiber_05.phpt
index 87ba3a856ca..1339a024303 100644
--- a/ext/zend_test/tests/observer_fiber_05.phpt
+++ b/ext/zend_test/tests/observer_fiber_05.phpt
@@ -4,6 +4,7 @@ Observer: Nested fibers with both unfinished
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_06.phpt b/ext/zend_test/tests/observer_fiber_06.phpt
index 5a80a8efc1c..9ea2df3d572 100644
--- a/ext/zend_test/tests/observer_fiber_06.phpt
+++ b/ext/zend_test/tests/observer_fiber_06.phpt
@@ -4,6 +4,7 @@ Observer: Throwing fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_generator_01.phpt b/ext/zend_test/tests/observer_generator_01.phpt
index f7170aad338..46e0a9fabc0 100644
--- a/ext/zend_test/tests/observer_generator_01.phpt
+++ b/ext/zend_test/tests/observer_generator_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic generator observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_02.phpt b/ext/zend_test/tests/observer_generator_02.phpt
index 289cfa1f954..9a275c33896 100644
--- a/ext/zend_test/tests/observer_generator_02.phpt
+++ b/ext/zend_test/tests/observer_generator_02.phpt
@@ -4,6 +4,7 @@ Observer: Generator with explicit return
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_03.phpt b/ext/zend_test/tests/observer_generator_03.phpt
index 9022cd33456..4c6bd8935af 100644
--- a/ext/zend_test/tests/observer_generator_03.phpt
+++ b/ext/zend_test/tests/observer_generator_03.phpt
@@ -4,6 +4,7 @@ Observer: Generator with 'yield from'
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_04.phpt b/ext/zend_test/tests/observer_generator_04.phpt
index 46fb272162e..1ac46148d3f 100644
--- a/ext/zend_test/tests/observer_generator_04.phpt
+++ b/ext/zend_test/tests/observer_generator_04.phpt
@@ -4,6 +4,7 @@ Observer: Generator with manual traversal
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_05.phpt b/ext/zend_test/tests/observer_generator_05.phpt
index d106be2ba6a..2a5e3bee0f9 100644
--- a/ext/zend_test/tests/observer_generator_05.phpt
+++ b/ext/zend_test/tests/observer_generator_05.phpt
@@ -4,6 +4,7 @@ Observer: Generator with uncaught exception
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_magic_01.phpt b/ext/zend_test/tests/observer_magic_01.phpt
index 0f89fba77f3..51969df5704 100644
--- a/ext/zend_test/tests/observer_magic_01.phpt
+++ b/ext/zend_test/tests/observer_magic_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic magic method observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_opline_01.phpt b/ext/zend_test/tests/observer_opline_01.phpt
index 35727349bb4..e76277f8e4b 100644
--- a/ext/zend_test/tests/observer_opline_01.phpt
+++ b/ext/zend_test/tests/observer_opline_01.phpt
@@ -4,6 +4,7 @@ Observer: Ensure opline exists on the execute_data
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_opcode=1
 opcache.jit=0
diff --git a/ext/zend_test/tests/observer_retval_01.phpt b/ext/zend_test/tests/observer_retval_01.phpt
index a63b0bd0efc..249796ec5ff 100644
--- a/ext/zend_test/tests/observer_retval_01.phpt
+++ b/ext/zend_test/tests/observer_retval_01.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CONST
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 opcache.optimization_level=0
diff --git a/ext/zend_test/tests/observer_retval_02.phpt b/ext/zend_test/tests/observer_retval_02.phpt
index 73992aa5831..3d79fb3bebc 100644
--- a/ext/zend_test/tests/observer_retval_02.phpt
+++ b/ext/zend_test/tests/observer_retval_02.phpt
@@ -4,6 +4,7 @@ Observer: Unused retvals from generators are still observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_03.phpt b/ext/zend_test/tests/observer_retval_03.phpt
index 247c56480b0..bf004cd37f1 100644
--- a/ext/zend_test/tests/observer_retval_03.phpt
+++ b/ext/zend_test/tests/observer_retval_03.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_04.phpt b/ext/zend_test/tests/observer_retval_04.phpt
index a08a5de378e..876c3089664 100644
--- a/ext/zend_test/tests/observer_retval_04.phpt
+++ b/ext/zend_test/tests/observer_retval_04.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_05.phpt b/ext/zend_test/tests/observer_retval_05.phpt
index 7d05cb92986..81752236696 100644
--- a/ext/zend_test/tests/observer_retval_05.phpt
+++ b/ext/zend_test/tests/observer_retval_05.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV, IS_UNDEF
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_06.phpt b/ext/zend_test/tests/observer_retval_06.phpt
index ffb41aac598..a20bba5eb2c 100644
--- a/ext/zend_test/tests/observer_retval_06.phpt
+++ b/ext/zend_test/tests/observer_retval_06.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_07.phpt b/ext/zend_test/tests/observer_retval_07.phpt
index 9c9c6246f58..14ce53dae9c 100644
--- a/ext/zend_test/tests/observer_retval_07.phpt
+++ b/ext/zend_test/tests/observer_retval_07.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_REFERENCE, IS_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_01.phpt b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
index 2a7b74de8a7..0d74229ae93 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_01.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_02.phpt b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
index b28dc704e4d..f1eac5c6051 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_02.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_TMP_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_03.phpt b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
index 9c4cd622e7d..ae4372689c9 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_03.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_VAR, ZEND_RETURNS_FUN
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 opcache.optimization_level=0
diff --git a/ext/zend_test/tests/observer_shutdown_01.phpt b/ext/zend_test/tests/observer_shutdown_01.phpt
index 837d0f7f2b7..78ea6007f6c 100644
--- a/ext/zend_test/tests/observer_shutdown_01.phpt
+++ b/ext/zend_test/tests/observer_shutdown_01.phpt
@@ -4,6 +4,7 @@ Observer: Function calls from a shutdown handler are observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_shutdown_02.phpt b/ext/zend_test/tests/observer_shutdown_02.phpt
index f3fbce36dfb..fbe74bf048a 100644
--- a/ext/zend_test/tests/observer_shutdown_02.phpt
+++ b/ext/zend_test/tests/observer_shutdown_02.phpt
@@ -4,6 +4,7 @@ Observer: Function calls from a __destruct during shutdown are observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_types_01.phpt b/ext/zend_test/tests/observer_types_01.phpt
index 7176ab32b49..fdf9f7ad009 100644
--- a/ext/zend_test/tests/observer_types_01.phpt
+++ b/ext/zend_test/tests/observer_types_01.phpt
@@ -4,6 +4,7 @@ Observer: Observe basic TypeError
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_zend_call_function_01.phpt b/ext/zend_test/tests/observer_zend_call_function_01.phpt
index e148c9b20bd..4a9b6e5d9d3 100644
--- a/ext/zend_test/tests/observer_zend_call_function_01.phpt
+++ b/ext/zend_test/tests/observer_zend_call_function_01.phpt
@@ -4,6 +4,7 @@ Observer: Calls that go through zend_call_function are observed
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php