Changeset 63567 for trunk

Timestamp:

09/09/2026 07:49:38 PM (2 days ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use array_key_first() to read the first key of an array.

Reading the first key of an array through array_keys() allocates a full array of every key just to keep one entry and discard the rest. array_key_first() reads the first bucket directly.

Follow-up to r63297 / #65773, which is scoped to the two nested current( array_keys( $array ) ) call sites. This commit covers a second shape of the same idea, which that ticket does not include: the key array is assigned to a variable first, then read on the next line.

$keys    = array_keys( $wp_registered_sidebars );
$sidebar = reset( $keys );

$sidebar = array_key_first( $wp_registered_sidebars );

13 occurrences across 11 files, in two shapes — reset( $keys ) and $keys[0]. In every case the intermediate variable existed only to carry the key array to the next line and is never read again afterwards.

One change that goes further

In spawn_cron() and _wp_cron() the surrounding check is dropped too:

$keys = array_keys( $crons );
if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {

if ( array_key_first( $crons ) > $gmt_time ) {

Both functions return early a few lines above when $crons is empty, so isset( $keys[0] ) can never be false there.

Behavior notes

• On an empty array reset() returns false while array_key_first() returns null. None of the touched call sites compares the result with ===, and most sit behind an empty() guard.
• Where the old code used $keys[0], the new code is strictly safer: $keys[0] emitted a notice on an empty array, array_key_first() returns null quietly.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/12790.

Follow-up to r63297.

Props Soean, mukesh27.
See #65773.

Location:

trunk/src

Files:

• wp-admin/import.php (modified) (1 diff)
• wp-admin/includes/class-plugin-upgrader.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/plugin-install.php (modified) (1 diff)
• wp-admin/includes/revision.php (modified) (1 diff)
• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/widgets-form.php (modified) (1 diff)
• wp-includes/class-wp-query.php (modified) (1 diff)
• wp-includes/cron.php (modified) (2 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php (modified) (1 diff)
• wp-includes/widgets/class-wp-widget-tag-cloud.php (modified) (1 diff)

trunk/src/wp-admin/import.php

@@ -119 +119 @@
                                 $plugins = get_plugins( '/' . $plugin_slug );
                                 if ( ! empty( $plugins ) ) {
-                                        $keys        = array_keys( $plugins );
-                                        $plugin_file = $plugin_slug . '/' . $keys[0];
+                                        $plugin_file = $plugin_slug . '/' . array_key_first( $plugins );
                                         $url         = wp_nonce_url(
                                                 add_query_arg(

trunk/src/wp-admin/includes/class-plugin-upgrader.php

@@ -543 +543 @@
 
                 // Assume the requested plugin is the first in the list.
-                $plugin_files = array_keys( $plugin );
-
-                return $this->result['destination_name'] . '/' . $plugin_files[0];
+                return $this->result['destination_name'] . '/' . array_key_first( $plugin );
         }
 

trunk/src/wp-admin/includes/media.php

@@ -797 +797 @@
 
         if ( isset( $_POST['send'] ) ) {
-                $keys    = array_keys( $_POST['send'] );
-                $send_id = (int) reset( $keys );
+                $send_id = (int) array_key_first( $_POST['send'] );
         }
 
@@ -1686 +1685 @@
 
         $post_mime_types = get_post_mime_types();
-        $keys            = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
-        $type            = reset( $keys );
+        $matched_types   = wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type );
+        $type            = array_key_first( $matched_types ) ?? '';
         $type_html       = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 

trunk/src/wp-admin/includes/plugin-install.php

@@ -594 +594 @@
         $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description';
         if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
-                $section_titles = array_keys( (array) $api->sections );
-                $section        = reset( $section_titles );
+                $section = array_key_first( (array) $api->sections );
         }
 

trunk/src/wp-admin/includes/revision.php

@@ -326 +326 @@
                 $found = array_search( $selected_revision_id, array_keys( $revisions ), true );
                 if ( $found ) {
-                        $from = array_keys( array_slice( $revisions, $found - 1, 1, true ) );
-                        $from = reset( $from );
+                        $from = array_key_first( array_slice( $revisions, $found - 1, 1, true ) );
                 } else {
                         $from = 0;

trunk/src/wp-admin/plugin-editor.php

@@ -72 +72 @@
                 }
         } else {
-                $plugin = array_keys( $plugins );
-                $plugin = $plugin[0];
+                $plugin = array_key_first( $plugins );
         }
 }

trunk/src/wp-admin/widgets-form.php

@@ -230 +230 @@
         if ( isset( $_GET['addnew'] ) ) {
                 // Default to the first sidebar.
-                $keys    = array_keys( $wp_registered_sidebars );
-                $sidebar = reset( $keys );
+                $sidebar = array_key_first( $wp_registered_sidebars );
 
                 if ( isset( $_GET['base'] ) && isset( $_GET['num'] ) ) { // Multi-widget.

trunk/src/wp-includes/class-wp-query.php

@@ -4029 +4029 @@
                                 // For other tax queries, grab the first term from the first clause.
                                 if ( ! empty( $this->tax_query->queried_terms ) ) {
-                                        $queried_taxonomies = array_keys( $this->tax_query->queried_terms );
-                                        $matched_taxonomy   = reset( $queried_taxonomies );
-                                        $query              = $this->tax_query->queried_terms[ $matched_taxonomy ];
+                                        $matched_taxonomy = array_key_first( $this->tax_query->queried_terms );
+                                        $query            = $this->tax_query->queried_terms[ $matched_taxonomy ];
 
                                         if ( ! empty( $query['terms'] ) ) {

trunk/src/wp-includes/cron.php

@@ -930 +930 @@
         }
 
-        $keys = array_keys( $crons );
-        if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
+        if ( array_key_first( $crons ) > $gmt_time ) {
                 return false;
         }
@@ -1060 +1059 @@
 
         $gmt_time = microtime( true );
-        $keys     = array_keys( $crons );
-        if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
+        if ( array_key_first( $crons ) > $gmt_time ) {
                 return 0;
         }

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php

@@ -201 +201 @@
                 }
 
-                $plugin_files = array_keys( $plugin_files );
-
-                return $slug . '/' . reset( $plugin_files );
+                return $slug . '/' . array_key_first( $plugin_files );
         }
 

trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php

@@ -170 +170 @@
                         // Just a single tag cloud supporting taxonomy found, no need to display a select.
                         case 1:
-                                $keys     = array_keys( $taxonomies );
-                                $taxonomy = reset( $keys );
+                                $taxonomy = array_key_first( $taxonomies );
                                 ?>
                                 <input type="hidden" id="<?php echo $this->get_field_id( 'taxonomy' ); ?>" name="<?php echo $this->get_field_name( 'taxonomy' ); ?>" value="<?php echo esc_attr( $taxonomy ); ?>" />