Let closure created from magic method accept named parameters #11364
+115
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iluuu1994
approved these changes
Jun 4, 2023
Girgias
approved these changes
Jun 4, 2023
| @@ -841,7 +852,7 @@ void zend_closure_from_frame(zval *return_value, zend_execute_data *call) { /* { | |||
|
|
|||
| memset(&trampoline, 0, sizeof(zend_internal_function)); | |||
| trampoline.type = ZEND_INTERNAL_FUNCTION; | |||
| trampoline.fn_flags = mptr->common.fn_flags & ZEND_ACC_STATIC; | |||
| trampoline.fn_flags = mptr->common.fn_flags & (ZEND_ACC_STATIC | ZEND_ACC_VARIADIC); | |||
There was a problem hiding this comment.
I just noticed something else, above there is a check for the __invoke magic method that compares a C string, but we have a known interned string for this ZEND_STR_MAGIC_INVOKE, wondering if it makes more sense to use this with zend_string_equals() as it will use a pointer comparison first.
But that is an aside.
There was a problem hiding this comment.
Probably, feel free to open a PR and check if there's more such cases ;)
Comment on lines
+297
to
+308
| if (EX_CALL_INFO() & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) { | ||
| zend_string *name; | ||
| zval *named_param_zval; | ||
| array_init_size(&fci.params[1], ZEND_NUM_ARGS() + zend_hash_num_elements(EX(extra_named_params))); | ||
| /* Avoid conversion from packed to mixed later. */ | ||
| zend_hash_real_init_mixed(Z_ARRVAL(fci.params[1])); | ||
| zend_copy_parameters_array(ZEND_NUM_ARGS(), &fci.params[1]); | ||
| ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(EX(extra_named_params), name, named_param_zval) { | ||
| Z_TRY_ADDREF_P(named_param_zval); | ||
| zend_hash_add_new(Z_ARRVAL(fci.params[1]), name, named_param_zval); | ||
| } ZEND_HASH_FOREACH_END(); | ||
| } else if (ZEND_NUM_ARGS()) { |
There was a problem hiding this comment.
I was wondering why we couldn't use the *named_params field of the FCI struct, before realising that we need to merge all the parameters into a single array to pass as an argument to the magic method.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes GH-11348.