Changeset 53274

Timestamp:

04/26/2022 11:41:27 AM (3 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:

• trunk/src/wp-includes/class-wp-site-query.php (modified) (1 diff)

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

@@ -740 +740 @@
      * @global wpdb $wpdb WordPress database abstraction object.
      *
-     * @param string   $string  Search string.
+     * @param string   $search  Search string.
      * @param string[] $columns Array of columns to search.
      * @return string Search SQL.
      */
-    protected function get_search_sql( $string, $columns ) {
+    protected function get_search_sql( $search, $columns ) {
         global $wpdb;
 
-        if ( false !== strpos( $string, '*' ) ) {
-            $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) ) . '%';
+        if ( false !== strpos( $search, '*' ) ) {
+            $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $search ) ) ) . '%';
         } else {
-            $like = '%' . $wpdb->esc_like( $string ) . '%';
+            $like = '%' . $wpdb->esc_like( $search ) . '%';
         }