Skip to content

RFC: array_find #14108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 31, 2024
Merged

RFC: array_find #14108

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cec1c62
Add `array_find` function
joshuaruesweg Mar 30, 2024
aefe7f3
Add `array_key_find` function
joshuaruesweg Apr 25, 2024
664475c
Add `array_any` implementation
joshuaruesweg Apr 25, 2024
8058c2f
Add `array_all` implementation
joshuaruesweg May 1, 2024
a8dfbbb
Remove helper variable `key` in php_array_find
joshuaruesweg May 1, 2024
6e28b0f
Remove needless `fci.params = args` call in loop
joshuaruesweg May 1, 2024
c0768d6
Remove false initalisation of `has_results`
joshuaruesweg May 1, 2024
19a80af
Remove `has_results` helper variable
joshuaruesweg May 1, 2024
e321daf
Add more tests for `array_find`
joshuaruesweg May 26, 2024
77493d3
Add more tests for `array_all`
joshuaruesweg May 26, 2024
72aeb73
Add more tests for `array_any`
joshuaruesweg May 26, 2024
90803ef
Add more tests for `array_find_key`
joshuaruesweg May 26, 2024
38c440f
Update `php_array_find` implementation
joshuaruesweg May 26, 2024
e3db846
Specify test descriptions
joshuaruesweg May 29, 2024
4113c1f
[skip ci] NEWS/UPGRADING
TimWolla May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove helper variable key in php_array_find
  • Loading branch information
@joshuaruesweg
joshuaruesweg committed May 30, 2024
commit a8dfbbb904dcbe1ce920bbac3d74d9012af6c7e1
6 changes: 2 additions & 4 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6586,7 +6586,6 @@ static zend_result php_array_find(const HashTable *array, zend_fcall_info fci, z
zend_ulong num_key;
zend_string *str_key;
zval retval;
zval *key;
zval args[2];
zval *operand;
*has_result = false;
Expand All @@ -6599,14 +6598,13 @@ static zend_result php_array_find(const HashTable *array, zend_fcall_info fci, z

fci.retval = &retval;
fci.param_count = 2;
key = &args[1];

ZEND_HASH_FOREACH_KEY_VAL(array, num_key, str_key, operand) {
/* Set up the key */
if (!str_key) {
ZVAL_LONG(key, num_key);
ZVAL_LONG(&args[1], num_key);
} else {
ZVAL_STR_COPY(key, str_key);
ZVAL_STR_COPY(&args[1], str_key);
}

ZVAL_COPY(&args[0], operand);
Expand Down