php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do nesting for internal execute hook

Browse Source
This commit is contained in:
ndossche
2026-01-20 15:45:53 +01:00
committed by Niels Dossche
parent 8776c7ead1
commit 6a4d0d9456
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/zend_test/observer.c
View File

@@ -298,12 +298,16 @@ static void zend_test_execute_internal(zend_execute_data *execute_data, zval *re
}
}
ZT_G(observer_nesting_depth)++;
if (zend_test_prev_execute_internal) {
zend_test_prev_execute_internal(execute_data, return_value);
} else {
fbc->internal_function.handler(execute_data, return_value);
}
ZT_G(observer_nesting_depth)--;
if (fbc->common.function_name) {
if (EG(exception)) {
php_printf("%*s<!-- Exception: %s -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(EG(exception)->ce->name));

12
ext/zend_test/tests/execute_internal.phpt
View File

@@ -14,6 +14,8 @@ function f($a) {
f(time() > 0 ? [1, 2, 3] : []);
array_map("count", [[], [1, 2]]);
?>
--EXPECTF--
<!-- internal enter time() -->
@@ -23,3 +25,13 @@ f(time() > 0 ? [1, 2, 3] : []);
<!-- internal enter var_dump() -->
int(6)
<!-- internal leave var_dump():NULL -->
<!-- internal enter array_map() -->
<!-- internal enter count() -->
<!-- internal leave count():0 -->
<!-- internal enter count() -->
<!-- internal leave count():2 -->
<!-- internal leave array_map():
array (
0 => 0,
1 => 2,
) -->