From: Máté Kocsis Date: Thu, 7 Nov 2019 00:11:57 +0000 (+0100) Subject: Promote register_tick_function() callback validation warning to an exception X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afe4a879c77779b24742a529e5c6ce67411ddf83;p=php Promote register_tick_function() callback validation warning to an exception --- diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index b11311b51c..b405842c01 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4278,9 +4278,9 @@ PHP_FUNCTION(register_tick_function) if (!zend_is_callable(&tick_fe.arguments[0], 0, &function_name)) { efree(tick_fe.arguments); - php_error_docref(NULL, E_WARNING, "Invalid tick callback '%s' passed", ZSTR_VAL(function_name)); + zend_type_error("Invalid tick callback '%s' passed", ZSTR_VAL(function_name)); zend_string_release_ex(function_name, 0); - RETURN_FALSE; + return; } else if (function_name) { zend_string_release_ex(function_name, 0); } diff --git a/ext/standard/tests/general_functions/register_tick_function_error.phpt b/ext/standard/tests/general_functions/register_tick_function_error.phpt new file mode 100644 index 0000000000..b71f1ea5d5 --- /dev/null +++ b/ext/standard/tests/general_functions/register_tick_function_error.phpt @@ -0,0 +1,14 @@ +--TEST-- +register_tick_function only accepts a valid callback as parameter +--FILE-- +getMessage() . "\n"; +} +?> +--EXPECT-- +Invalid tick callback 'a' passed