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

zend_call_function: emit function deprecation before setting up call frame (#20264)

Browse Source
This commit is contained in:
Gina Peter Banyard
2025-10-23 16:30:46 +01:00
committed by GitHub
parent b3d846521b
commit 005d04aa96
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Zend/tests/functions/zend_call_function_deprecated_frame.phpt Normal file
View File

@@ -0,0 +1,25 @@
--TEST--
Deprecated function notice promoted to exception within zend_call_function()
--FILE--
<?php
#[Deprecated]
function foo(string $v) {
return $v . '!';
}
set_error_handler(function ($number, $message) {
throw new Exception($message);
});
$a = array_map(foo(...), ['Hello', 'World']);
var_dump($a);
?>
--EXPECTF--
Fatal error: Uncaught Exception: Function foo() is deprecated in %s:%d
Stack trace:
#0 [internal function]: {closure:%s:%d}(16384, 'Function foo() ...', '%s', %d)
#1 %s(%d): array_map(Object(Closure), Array)
#2 {main}
thrown in %s on line %d

7
Zend/zend_execute_API.c
View File

@@ -862,18 +862,17 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
call_info = ZEND_CALL_TOP_FUNCTION | ZEND_CALL_DYNAMIC | ZEND_CALL_HAS_THIS;
}
call = zend_vm_stack_push_call_frame(call_info,
func, fci->param_count, object_or_called_scope);
if (UNEXPECTED(func->common.fn_flags & ZEND_ACC_DEPRECATED)) {
zend_deprecated_function(func);
if (UNEXPECTED(EG(exception))) {
zend_vm_stack_free_call_frame(call);
return SUCCESS;
}
}
call = zend_vm_stack_push_call_frame(call_info,
func, fci->param_count, object_or_called_scope);
for (uint32_t i = 0; i < fci->param_count; i++) {
zval *param = ZEND_CALL_ARG(call, i+1);
zval *arg = &fci->params[i];