Make WordPress Core

Changeset 53274


Ignore:
Timestamp:
04/26/2022 11:41:27 AM (2 years ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-site-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_Site_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].

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

File:
1 edited

Legend:

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

    r53175 r53274  
    740740     * @global wpdb $wpdb WordPress database abstraction object.
    741741     *
    742      * @param string   $string  Search string.
     742     * @param string   $search  Search string.
    743743     * @param string[] $columns Array of columns to search.
    744744     * @return string Search SQL.
    745745     */
    746     protected function get_search_sql( $string, $columns ) {
     746    protected function get_search_sql( $search, $columns ) {
    747747        global $wpdb;
    748748
    749         if ( false !== strpos( $string, '*' ) ) {
    750             $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) ) . '%';
     749        if ( false !== strpos( $search, '*' ) ) {
     750            $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $search ) ) ) . '%';
    751751        } else {
    752             $like = '%' . $wpdb->esc_like( $string ) . '%';
     752            $like = '%' . $wpdb->esc_like( $search ) . '%';
    753753        }
    754754
Note: See TracChangeset for help on using the changeset viewer.