Skip to content

Commit ed041c3

Browse files
committed
Partial backport of e7462bf
e7462bf
1 parent 560a585 commit ed041c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+50
-0
lines changed

ext/opcache/tests/jit/ignored_opcodes.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ opcache.jit_buffer_size=1M
88
opcache.jit=function
99
;opcache.jit_debug=257
1010
zend_test.observer.enabled=1
11+
zend_test.observer.show_output=1
1112
zend_test.observer.observe_all=1
1213
zend_test.observer.show_opcode_in_user_handler=ZEND_EXIT, ZEND_BEGIN_SILENCE, ZEND_END_SILENCE
1314
--EXTENSIONS--

ext/zend_test/tests/observer_backtrace_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Show backtrace on init
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_init_backtrace=1
910
--FILE--

ext/zend_test/tests/observer_basic_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_basic_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of userland methods
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_basic_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of includes
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_basic_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of includes only (no functions)
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_includes=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_basic_05.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of functions only (no includes)
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_functions=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_bug81430_1.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ zend_test
55
--INI--
66
memory_limit=20M
77
zend_test.observer.enabled=1
8+
zend_test.observer.show_output=1
89
zend_test.observer.observe_all=1
910
--FILE--
1011
<?php

ext/zend_test/tests/observer_bug81430_2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ zend_test
55
--INI--
66
memory_limit=20M
77
zend_test.observer.enabled=1
8+
zend_test.observer.show_output=1
89
zend_test.observer.observe_all=1
910
--FILE--
1011
<?php

ext/zend_test/tests/observer_bug81435.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ zend_test
55
--INI--
66
memory_limit=20M
77
zend_test.observer.enabled=1
8+
zend_test.observer.show_output=1
89
zend_test.observer.observe_function_names=a,d
910
opcache.optimization_level=0
1011
--FILE--

ext/zend_test/tests/observer_call_user_func_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: call_user_func() from root namespace
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_call_user_func_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from root namespace
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_call_user_func_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: call_user_func() from namespace
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_call_user_func_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from namespace
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_closure_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of closures
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_closure_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Observability of fake closures
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_error_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: End handlers fire after a fatal error
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
memory_limit=2M

ext/zend_test/tests/observer_error_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_error_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: non-fatal errors do not fire end handlers prematurely
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_error_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ zend_test
55
soap
66
--INI--
77
zend_test.observer.enabled=1
8+
zend_test.observer.show_output=1
89
zend_test.observer.observe_all=1
910
zend_test.observer.show_return_value=1
1011
--FILE--

ext/zend_test/tests/observer_error_05.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_eval_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic eval observability
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_exception_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions with uncaught exceptions
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_fiber_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic fiber switching
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_init=1
89
zend_test.observer.fiber_switch=1
910
zend_test.observer.fiber_destroy=1

ext/zend_test/tests/observer_fiber_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Unfinished fiber
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_switch=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_fiber_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Nested fibers
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_switch=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_fiber_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Nested fibers with unfinished fiber
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_switch=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_fiber_05.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Nested fibers with both unfinished
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_switch=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_fiber_06.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Throwing fiber
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.fiber_switch=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_generator_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic generator observability
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_generator_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Generator with explicit return
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_generator_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Generator with 'yield from'
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_generator_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Generator with manual traversal
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_generator_05.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Generator with uncaught exception
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_magic_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic magic method observability
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

ext/zend_test/tests/observer_opline_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Ensure opline exists on the execute_data
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_opcode=1
910
opcache.jit=0

ext/zend_test/tests/observer_retval_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CONST
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
opcache.optimization_level=0

ext/zend_test/tests/observer_retval_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Unused retvals from generators are still observable
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_CV
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_04.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_VAR
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_05.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV, IS_UNDEF
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_06.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_07.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_REFERENCE, IS_VAR
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_by_ref_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_CV
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_by_ref_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_TMP_VAR
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_retval_by_ref_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_VAR, ZEND_RETURNS_FUN
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
opcache.optimization_level=0

ext/zend_test/tests/observer_shutdown_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Function calls from a shutdown handler are observable
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_shutdown_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Function calls from a __destruct during shutdown are observable
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_types_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Observe basic TypeError
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
zend_test.observer.show_return_value=1
910
--FILE--

ext/zend_test/tests/observer_zend_call_function_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Calls that go through zend_call_function are observed
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_all=1
89
--FILE--
910
<?php

0 commit comments

Comments
 (0)