Changeset 61474

Timestamp:

01/12/2026 09:15:00 PM (2 weeks ago)

Author:

westonruter

Message:

Code Modernization: Utilize spaceship operator <=> in sort comparison logic.

Some replaced instances also fix a bug where the comparison function should have returned 0 as opposed to 1 or -1 as used in ternaries. This results in a performance improvement.

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

Props soean, mukesh27, westonruter.
Fixes #64497.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• wp-admin/includes/menu.php (modified) (1 diff)
• wp-includes/interactivity-api/class-wp-interactivity-api.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -303 +303 @@
         $b = $theme_b[ $orderby ];
 
-        if ( $a === $b ) {
-            return 0;
-        }
-
-        if ( 'DESC' === $order ) {
-            return ( $a < $b ) ? 1 : -1;
-        } else {
-            return ( $a < $b ) ? -1 : 1;
-        }
+        return 'DESC' === $order ?
+            $b <=> $a :
+            $a <=> $b;
     }
 

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -459 +459 @@
         $b = $plugin_b->$orderby;
 
-        if ( $a === $b ) {
-            return 0;
-        }
-
-        if ( 'DESC' === $this->order ) {
-            return ( $a < $b ) ? 1 : -1;
-        } else {
-            return ( $a < $b ) ? -1 : 1;
-        }
+        return 'DESC' === $this->order ?
+            $b <=> $a :
+            $a <=> $b;
     }
 

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

@@ -328 +328 @@
             return 1;
         } elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
-            if ( $menu_order[ $a ] === $menu_order[ $b ] ) {
-                return 0;
-            }
-            return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
+            return $menu_order[ $a ] <=> $menu_order[ $b ];
         } else {
-            return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
+            return $default_menu_order[ $a ] <=> $default_menu_order[ $b ];
         }
     }

trunk/src/wp-includes/interactivity-api/class-wp-interactivity-api.php

@@ -905 +905 @@
                 $b_suffix = $b['suffix'] ?? '';
                 if ( $a_suffix !== $b_suffix ) {
-                    return $a_suffix < $b_suffix ? -1 : 1;
+                    return $a_suffix <=> $b_suffix;
                 }
                 $a_id = $a['unique_id'] ?? '';
                 $b_id = $b['unique_id'] ?? '';
-                if ( $a_id === $b_id ) {
-                    return 0;
-                }
-                return $a_id > $b_id ? 1 : -1;
+                return $a_id <=> $b_id;
             }
         );

trunk/src/wp-includes/script-loader.php

@@ -3000 +3000 @@
             $styles,
             static function ( $a, $b ) {
-                return ( $a['size'] <= $b['size'] ) ? -1 : 1;
+                return $a['size'] <=> $b['size'];
             }
         );