Skip to content

Code Modernization: Use array_find() and array_find_key() in various places #12273

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

Open
Soean wants to merge 10 commits into
base: trunk
Choose a base branch
from
+9 −14
Open

Code Modernization: Use array_find() and array_find_key() in various places #12273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d36aa35
Code Modernization: Use array_find() and array_find_key() in various …
Soean Jun 23, 2026
d72b86e
Improve
Soean Jun 23, 2026
8795b5e
Update src/wp-includes/widgets.php
Soean Jun 23, 2026
f0706b4
Update src/wp-includes/functions.php
Soean Jun 23, 2026
22fa189
Revert
Soean Jun 23, 2026
47c3914
Merge branch 'trunk' into try/array_find
Soean Jul 9, 2026
8a74727
Add another array_find_key()
Soean Jul 9, 2026
a120ab2
Merge branch 'trunk' into try/array_find
Soean Jul 30, 2026
fc76c13
Use `array_find()`
Soean Jul 30, 2026
89c3d3b
Revert
Soean Jul 30, 2026
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
10 changes: 4 additions & 6 deletions src/wp-includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3033,12 +3033,10 @@ function wp_ext2type( $ext ) {
$ext = strtolower( $ext );

$ext2type = wp_get_ext_types();
foreach ( $ext2type as $type => $exts ) {
if ( in_array( $ext, $exts, true ) ) {
return $type;
}
}
return null;
return array_find_key(
$ext2type,
fn( $exts ) => in_array( $ext, $exts, true )
);
}

/**
Expand Down
13 changes: 5 additions & 8 deletions src/wp-includes/interactivity-api/class-wp-interactivity-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,15 +1387,12 @@ private function merge_style_property( string $style_attribute_value, string $st
*/
private function data_wp_text_processor( WP_Interactivity_API_Directives_Processor $p, string $mode ) {
if ( 'enter' === $mode ) {
$entries = $this->get_directive_entries( $p, 'text' );
$valid_entry = null;
$entries = $this->get_directive_entries( $p, 'text' );
// Get the first valid `data-wp-text` entry without suffix or unique ID.
foreach ( $entries as $entry ) {
if ( null === $entry['suffix'] && null === $entry['unique_id'] && ! empty( $entry['value'] ) ) {
$valid_entry = $entry;
break;
}
}
$valid_entry = array_find(
$entries,
fn( $entry ) => null === $entry['suffix'] && null === $entry['unique_id'] && ! empty( $entry['value'] )
);
if ( null === $valid_entry ) {
return;
}
Expand Down
Loading