Changeset 53276

Timestamp:

04/26/2022 11:44:23 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-user-query.php.

While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.

This commit renames the $string parameter to $search in WP_User_Query::get_search_sql().

Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.

File:

• trunk/src/wp-includes/class-wp-user-query.php (modified) (3 diffs)

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

@@ -869 +869 @@
      * @global wpdb $wpdb WordPress database abstraction object.
      *
-     * @param string $string
+     * @param string $search
      * @param array  $cols
      * @param bool   $wild   Whether to allow wildcard searches. Default is false for Network Admin, true for single site.
@@ -875 +875 @@
      * @return string
      */
-    protected function get_search_sql( $string, $cols, $wild = false ) {
+    protected function get_search_sql( $search, $cols, $wild = false ) {
         global $wpdb;
 
@@ -881 +881 @@
         $leading_wild  = ( 'leading' === $wild || 'both' === $wild ) ? '%' : '';
         $trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : '';
-        $like          = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+        $like          = $leading_wild . $wpdb->esc_like( $search ) . $trailing_wild;
 
         foreach ( $cols as $col ) {
             if ( 'ID' === $col ) {
-                $searches[] = $wpdb->prepare( "$col = %s", $string );
+                $searches[] = $wpdb->prepare( "$col = %s", $search );
             } else {
                 $searches[] = $wpdb->prepare( "$col LIKE %s", $like );