Skip to content

Commit 18496cc

Browse files
committed
Merge branch 'PHP-8.3'
2 parents dad2d56 + dbaeb62 commit 18496cc

File tree

65 files changed

+66
-0
lines changed

Some content is hidden

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

65 files changed

+66
-0
lines changed

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ jobs:
171171
-d opcache.enable_cli=1 \
172172
-d opcache.jit_buffer_size=64M \
173173
-d opcache.jit=tracing \
174+
-d zend_test.observer.enabled=1 \
175+
-d zend_test.observer.show_output=0 \
174176
-P -q -x -j2 \
175177
-g FAIL,BORK,LEAK,XLEAK \
176178
--no-progress \

.github/nightly_matrix.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function get_matrix_include(array $branches) {
6464
'debug' => true,
6565
'zts' => true,
6666
'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE'",
67+
'run_tests_parameters' => '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0',
6768
'timeout_minutes' => 360,
6869
'test_function_jit' => true,
6970
'asan' => false,

Zend/tests/gh10346.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Florian Sowade
66
zend_test
77
--INI--
88
zend_test.observer.enabled=1
9+
zend_test.observer.show_output=1
910
zend_test.observer.observe_all=1
1011
--FILE--
1112
<?php

ext/ffi/tests/gh12905.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ try {
1414
--INI--
1515
ffi.enable=1
1616
zend_test.observer.enabled=1
17+
zend_test.observer.show_output=1
1718
zend_test.observer.observe_all=1
1819
zend_test.observer.show_return_value=0
1920
--FILE--

ext/opcache/tests/gh13712.phpt

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

ext/opcache/tests/jit/ignored_opcodes.phpt

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

ext/zend_test/tests/gh9871.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ zend_test
55
--INI--
66
opcache.enable_cli=1
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_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
opcache.optimization_level=0x7FFFBFFF & ~0x0080
910
--FILE--

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
opcache.optimization_level=0x7FFFBFFF & ~0x0080
910
--FILE--

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_basic_06.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 (with run-time swapping)
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_function_names=foo
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
--SKIPIF--
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
--SKIPIF--

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
opcache.optimization_level=0x7FFFBFFF & ~0x0080
910
--FILE--

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_closure_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Observability of closures of builtin 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_declarations_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Observe function and class declarations
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.observe_declaring=1
910
--FILE--

ext/zend_test/tests/observer_declarations_file_cache.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Observe function and class declarations with file_cache_only
44
zend_test
55
--INI--
66
zend_test.observer.enabled=1
7+
zend_test.observer.show_output=1
78
zend_test.observer.observe_declaring=1
89
opcache.enable_cli=1
910
opcache.file_cache="{TMP}"

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_fiber_functions_01.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Basic function observing in fibers
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.fiber_init=1
910
zend_test.observer.fiber_switch=1

ext/zend_test/tests/observer_fiber_functions_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Function observing in 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.observe_all=1
89
zend_test.observer.fiber_init=1
910
zend_test.observer.fiber_switch=1

ext/zend_test/tests/observer_fiber_functions_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Observer: Function observing in fibers with bailout in fiber
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.fiber_init=1
910
zend_test.observer.fiber_switch=1

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

0 commit comments

Comments
 (0)