Changeset 53376

Timestamp:

05/10/2022 11:19:51 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Restore the $pieces variable for SQL clauses in query classes.

This is a defensive coding measure that aims to reduce confusion. With this change, $pieces is explicitly used for the names, and $clauses for the values of the clauses.

Follow-up to [52974], [53175], [53370], [53375].

Props peterwilsoncc.
See #55699.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (2 diffs)
• class-wp-network-query.php (modified) (2 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'] );
 
-                $clauses = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+                $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
                 /**
@@ -928 +928 @@
                  * @param WP_Comment_Query $query   Current instance of WP_Comment_Query (passed by reference).
                  */
-                $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $clauses ), &$this ) );
+                $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
 
                 $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

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

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

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

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

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

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