Clean up array function signatures for named parameters #6046
Conversation
|
|
||
| function array_replace_recursive(array $array1, array ...$arrays): array {} | ||
| function array_replace_recursive(array $array, array ...$substitutions): array {} |
There was a problem hiding this comment.
How about $replacements? It would be consistent with array_splice() and heading towards consistency with many other $replace parameters.
There was a problem hiding this comment.
Looking through the stub file, $replacement is only used once, in array_splice(). $replace is used a whole bunch of times. $substitutions is used nowhere but in this change. So, yeah, $replacements makes sense.
I think we should then also change array_splice() to $replacements. It's not variadic, but it is an array.
Crell
force-pushed
the
array-funcs
branch
4 times, most recently
from
7d1537d to
b7db46c
Compare
|
Rebased against master and squashed. 🤞 |
Crell
force-pushed
the
array-funcs
branch
2 times, most recently
from
a2db922 to
3bdcbc0
Compare
Change $sort_flags to $flags. Remove $array1 from array_map() Rename $cmp_function to $comparison in user-sorting functions. Change $funcname to the more standard $callback. Remove $array1 from array_replace*(). Simplify array_keys() arguments to be more usefully named. Change array_diff*() and array_intersect*() to have be more logically named parameters. Standardize array_key_exists() on $array, which the docs already use. Switch array_fill*() arguments to be more self-descriptive. Change $vars to $values in array_unshift(), to be more consistent and descriptive. Rename $userdata to $arguments, since that is how it will be used. Change array_replace() to use $substitutions instead. Update more tests. Standardize callback name to $callback. Update tests. Use plurals for variadics. Update another test. Update reflection tests. Fix another test. Use $replacements for substitution values. Update tests.
|
Apparently #6097 stepped all over this one, and the diff/intersect functions are now incompatible with named parameters. 😢 For lack of better options or feedback I rebased it and stripped out those functions. I disagree with that change but I don't want to block the rest of these. The AppVeyor fails seem entirely unrelated. I'm not sure what's going on there but it may be an AppVeyor problem. |
|
Comment on behalf of pollita at php.net: Pushed as 96f2f31 |
Folding a few other PRs into this one... After some discussion in chat, here's the guidelines I used:
$array.$arrays(because that's what was already there).$rest. I left those as is and died a little inside.$callback. (Nearly all were already, I just fixed the one or two outliers.)array_multisort()is beyond help so I ran screaming.I think everything else in the
array_*()andsort*()namespace makes sense now.