Changeset 62550

Timestamp:

06/23/2026 01:53:35 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use array_any() where appropriate.

This commit replaces several foreach loops that iterate an array, return true as soon as an element matches a condition, and otherwise fall through to false. That is exactly what PHP 8.4's array_any() expresses in a single, more readable call.

WordPress core includes a polyfill for array_any() on PHP < 8.4 as of WordPress 6.8, so the change works on every supported PHP version without raising the minimum requirement.

Follow-up to [59783].

Props Soean, mukesh27, SergeyBiryukov.
See #65519.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-site-health.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/block-template-utils.php (modified) (1 diff)
• wp-includes/class-wp-block-processor.php (modified) (1 diff)
• wp-includes/class-wp-scripts.php (modified) (1 diff)
• wp-includes/class-wp-styles.php (modified) (1 diff)
• wp-includes/kses.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -3835 +3835 @@
                 );
 
-                foreach ( $threshold_map as $threshold => $table ) {
-                        if ( $thresholds[ $threshold ] <= $results[ $table ]->rows ) {
-                                return true;
-                        }
-                }
-
-                return false;
+                return array_any( $threshold_map, fn( $table, $threshold ) => $thresholds[ $threshold ] <= $results[ $table ]->rows );
         }
 

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

@@ -1981 +1981 @@
 
                 // If the new autosave has the same content as the post, delete the autosave.
-                $autosave_is_different = false;
-                foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
-                        if ( normalize_whitespace( $new_autosave[ $field ] ) !== normalize_whitespace( $post->$field ) ) {
-                                $autosave_is_different = true;
-                                break;
-                        }
-                }
+                $fields                = array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) );
+                $autosave_is_different = array_any( $fields, fn( $field ) => normalize_whitespace( $new_autosave[ $field ] ) !== normalize_whitespace( $post->$field ) );
 
                 if ( ! $autosave_is_different ) {

trunk/src/wp-includes/block-template-utils.php

@@ -1462 +1462 @@
         $directories_to_ignore = array( '.DS_Store', '.svn', '.git', '.hg', '.bzr', 'node_modules', 'vendor' );
 
-        foreach ( $directories_to_ignore as $directory ) {
-                if ( str_starts_with( $path, $directory ) ) {
-                        return true;
-                }
-        }
-
-        return false;
+        return array_any( $directories_to_ignore, fn( $directory ) => str_starts_with( $path, $directory ) );
 }
 

trunk/src/wp-includes/class-wp-block-processor.php

@@ -1599 +1599 @@
                 }
 
-                foreach ( $block_type as $block ) {
-                        if ( $this->is_block_type( $block ) ) {
-                                return true;
-                        }
-                }
-
-                return false;
+                return array_any( $block_type, fn( $block ) => $this->is_block_type( $block ) );
         }
 

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

@@ -851 +851 @@
                 }
 
-                foreach ( (array) $this->default_dirs as $test ) {
-                        if ( str_starts_with( $src, $test ) ) {
-                                return true;
-                        }
-                }
-                return false;
+                return array_any( (array) $this->default_dirs, fn( $test ) => str_starts_with( $src, $test ) );
         }
 

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

@@ -460 +460 @@
                 }
 
-                foreach ( (array) $this->default_dirs as $test ) {
-                        if ( str_starts_with( $src, $test ) ) {
-                                return true;
-                        }
-                }
-                return false;
+                return array_any( (array) $this->default_dirs, fn( $test ) => str_starts_with( $src, $test ) );
         }
 

trunk/src/wp-includes/kses.php

@@ -2057 +2057 @@
         $scheme = strtolower( $scheme );
 
-        $allowed = false;
-        foreach ( (array) $allowed_protocols as $one_protocol ) {
-                if ( strtolower( $one_protocol ) === $scheme ) {
-                        $allowed = true;
-                        break;
-                }
-        }
+        $allowed = array_any( (array) $allowed_protocols, fn( $protocol ) => strtolower( $protocol ) === $scheme );
 
         if ( $allowed ) {