From 73992e59c296d9336e59f2e120d865c9b348fcf0 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Sun, 15 Nov 2026 17:45:23 +0100 Subject: [PATCH] Fix the argument named by the TypeError of an invalid stream context notification callback --- ext/standard/streamsfuncs.c | 2 +- ...stream_context_set_params_notification_error.phpt | 12 +++++++++--- ...t_set_params_notification_valid_then_invalid.phpt | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 9b23600b976a..f8d85b14d697 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -907,7 +907,7 @@ static zend_result parse_context_params(php_stream_context *context, const HashT zend_fcall_info_cache *fcc = emalloc(sizeof(*fcc)); char *error; if (!zend_is_callable_ex(tmp, NULL, 0, NULL, fcc, &error)) { - zend_argument_type_error(1, "must be an array with valid callbacks as values, %s", error); + zend_argument_type_error(2, "must have a valid callback for key \"notification\", %s", error); efree(fcc); efree(error); return FAILURE; diff --git a/ext/standard/tests/streams/stream_context_set_params_notification_error.phpt b/ext/standard/tests/streams/stream_context_set_params_notification_error.phpt index 32af36d0d477..6c11a40d25e2 100644 --- a/ext/standard/tests/streams/stream_context_set_params_notification_error.phpt +++ b/ext/standard/tests/streams/stream_context_set_params_notification_error.phpt @@ -1,5 +1,5 @@ --TEST-- -stream_context_set_params() with invalid notification option +stream_context_set_params() and stream_context_create() with invalid notification option --FILE-- getMessage(), PHP_EOL; } +try { + var_dump(stream_context_create(null, ["notification" => "fn_not_exist"])); +} catch (\Throwable $e) { + echo $e::class, ': ', $e->getMessage(), PHP_EOL; +} ?> --EXPECT-- -TypeError: stream_context_set_params(): Argument #1 ($context) must be an array with valid callbacks as values, function "fn_not_exist" not found or invalid function name -TypeError: stream_context_set_params(): Argument #1 ($context) must be an array with valid callbacks as values, class "myclass" not found +TypeError: stream_context_set_params(): Argument #2 ($params) must have a valid callback for key "notification", function "fn_not_exist" not found or invalid function name +TypeError: stream_context_set_params(): Argument #2 ($params) must have a valid callback for key "notification", class "myclass" not found +TypeError: stream_context_create(): Argument #2 ($params) must have a valid callback for key "notification", function "fn_not_exist" not found or invalid function name diff --git a/ext/standard/tests/streams/stream_context_set_params_notification_valid_then_invalid.phpt b/ext/standard/tests/streams/stream_context_set_params_notification_valid_then_invalid.phpt index 9f654d61761e..f133c3386e8d 100644 --- a/ext/standard/tests/streams/stream_context_set_params_notification_valid_then_invalid.phpt +++ b/ext/standard/tests/streams/stream_context_set_params_notification_valid_then_invalid.phpt @@ -17,4 +17,4 @@ try { ?> --EXPECT-- bool(true) -TypeError: stream_context_set_params(): Argument #1 ($context) must be an array with valid callbacks as values, function "fn_not_exist" not found or invalid function name +TypeError: stream_context_set_params(): Argument #2 ($params) must have a valid callback for key "notification", function "fn_not_exist" not found or invalid function name