Changeset 52974

Timestamp:

03/21/2022 12:20:22 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove a one-time $pieces variable in wp-includes/class-wp-*-query.php.

Use the existing $clauses variable instead for consistency.

See #54728.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (2 diffs)
• class-wp-network-query.php (modified) (2 diffs)
• class-wp-query.php (modified) (4 diffs)
• class-wp-site-query.php (modified) (2 diffs)
• class-wp-term-query.php (modified) (2 diffs)

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

@@ -918 +918 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+
         /**
          * Filters the comment query clauses.
@@ -924 +925 @@
          * @since 3.1.0
          *
-         * @param string[]         $pieces An associative array of comment query clauses.
-         * @param WP_Comment_Query $query  Current instance of WP_Comment_Query (passed by reference).
+         * @param string[]         $clauses An associative array of comment query clauses.
+         * @param WP_Comment_Query $query   Current instance of WP_Comment_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+        $clauses = apply_filters_ref_array( 'comments_clauses', array( $clauses, &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

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

@@ -439 +439 @@
         $groupby = '';
 
-        $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
         /**
@@ -446 +446 @@
          * @since 4.6.0
          *
-         * @param string[]         $pieces An associative array of network query clauses.
-         * @param WP_Network_Query $query  Current instance of WP_Network_Query (passed by reference).
+         * @param string[]         $clauses An associative array of network query clauses.
+         * @param WP_Network_Query $query   Current instance of WP_Network_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'networks_clauses', array( compact( $pieces ), &$this ) );
+        $clauses = apply_filters_ref_array( 'networks_clauses', array( $clauses, &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

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

@@ -2742 +2742 @@
         }
 
-        $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+        $clauses = compact( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
 
         /*
@@ -2844 +2844 @@
              * @param WP_Query $query   The WP_Query instance (passed by reference).
              */
-            $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
+            $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( $clauses, &$this ) );
 
             $where    = isset( $clauses['where'] ) ? $clauses['where'] : '';
@@ -2965 +2965 @@
              * @since 3.1.0
              *
-             * @param string[] $pieces {
+             * @param string[] $clauses {
              *     Associative array of the clauses for the query.
              *
@@ -2978 +2978 @@
              * @param WP_Query $query  The WP_Query instance (passed by reference).
              */
-            $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
+            $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( $clauses, &$this ) );
 
             $where    = isset( $clauses['where'] ) ? $clauses['where'] : '';

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

@@ -642 +642 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
         /**
@@ -649 +649 @@
          * @since 4.6.0
          *
-         * @param string[]      $pieces An associative array of site query clauses.
-         * @param WP_Site_Query $query  Current instance of WP_Site_Query (passed by reference).
+         * @param string[]      $clauses An associative array of site query clauses.
+         * @param WP_Site_Query $query   Current instance of WP_Site_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'sites_clauses', array( compact( $pieces ), &$this ) );
+        $clauses = apply_filters_ref_array( 'sites_clauses', array( $clauses, &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

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

@@ -693 +693 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $pieces = compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
+        $clauses = compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
 
         /**
@@ -700 +700 @@
          * @since 3.1.0
          *
-         * @param string[] $pieces     Array of query SQL clauses.
+         * @param string[] $clauses    Array of query SQL clauses.
          * @param string[] $taxonomies An array of taxonomy names.
          * @param array    $args       An array of term query arguments.
          */
-        $clauses = apply_filters( 'terms_clauses', $pieces, $taxonomies, $args );
+        $clauses = apply_filters( 'terms_clauses', $clauses, $taxonomies, $args );
 
         $fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';