Make WordPress Core


Ignore:
Timestamp:
04/26/2022 11:44:23 AM (23 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-user-query.php

    r53256 r53276  
    869869     * @global wpdb $wpdb WordPress database abstraction object.
    870870     *
    871      * @param string $string
     871     * @param string $search
    872872     * @param array  $cols
    873873     * @param bool   $wild   Whether to allow wildcard searches. Default is false for Network Admin, true for single site.
     
    875875     * @return string
    876876     */
    877     protected function get_search_sql( $string, $cols, $wild = false ) {
     877    protected function get_search_sql( $search, $cols, $wild = false ) {
    878878        global $wpdb;
    879879
     
    881881        $leading_wild  = ( 'leading' === $wild || 'both' === $wild ) ? '%' : '';
    882882        $trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : '';
    883         $like          = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
     883        $like          = $leading_wild . $wpdb->esc_like( $search ) . $trailing_wild;
    884884
    885885        foreach ( $cols as $col ) {
    886886            if ( 'ID' === $col ) {
    887                 $searches[] = $wpdb->prepare( "$col = %s", $string );
     887                $searches[] = $wpdb->prepare( "$col = %s", $search );
    888888            } else {
    889889                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
Note: See TracChangeset for help on using the changeset viewer.