Changeset 42343 for trunk/src/wp-includes/class-wp-tax-query.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/class-wp-tax-query.php (modified) (15 diffs)

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

@@ -48 +48 @@
      * @var string
      */
-    private static $no_results = array( 'join' => array( '' ), 'where' => array( '0 = 1' ) );
+    private static $no_results = array(
+        'join'  => array( '' ),
+        'where' => array( '0 = 1' ),
+    );
 
     /**
@@ -136 +139 @@
 
         $defaults = array(
-            'taxonomy' => '',
-            'terms' => array(),
-            'field' => 'term_id',
-            'operator' => 'IN',
+            'taxonomy'         => '',
+            'terms'            => array(),
+            'field'            => 'term_id',
+            'operator'         => 'IN',
             'include_children' => true,
         );
@@ -147 +150 @@
                 $cleaned_query['relation'] = $this->sanitize_relation( $query );
 
-            // First-order clause.
+                // First-order clause.
             } elseif ( self::is_first_order_clause( $query ) ) {
 
-                $cleaned_clause = array_merge( $defaults, $query );
+                $cleaned_clause          = array_merge( $defaults, $query );
                 $cleaned_clause['terms'] = (array) $cleaned_clause['terms'];
-                $cleaned_query[] = $cleaned_clause;
+                $cleaned_query[]         = $cleaned_clause;
 
                 /*
@@ -177 +180 @@
                 }
 
-            // Otherwise, it's a nested query, so we recurse.
+                // Otherwise, it's a nested query, so we recurse.
             } elseif ( is_array( $query ) ) {
                 $cleaned_subquery = $this->sanitize_query( $query );
@@ -248 +251 @@
      */
     public function get_sql( $primary_table, $primary_id_column ) {
-        $this->primary_table = $primary_table;
+        $this->primary_table     = $primary_table;
         $this->primary_id_column = $primary_id_column;
 
@@ -275 +278 @@
          */
         $queries = $this->queries;
-        $sql = $this->get_sql_for_query( $queries );
+        $sql     = $this->get_sql_for_query( $queries );
 
         if ( ! empty( $sql['where'] ) ) {
@@ -315 +318 @@
         $indent = '';
         for ( $i = 0; $i < $depth; $i++ ) {
-            $indent .= "  ";
+            $indent .= '  ';
         }
 
@@ -337 +340 @@
 
                     $sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
-                // This is a subquery, so we recurse.
+                    // This is a subquery, so we recurse.
                 } else {
                     $clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
@@ -400 +403 @@
         }
 
-        $terms = $clause['terms'];
+        $terms    = $clause['terms'];
         $operator = strtoupper( $clause['operator'] );
 
@@ -417 +420 @@
             $alias = $this->find_compatible_table_alias( $clause, $parent_query );
             if ( false === $alias ) {
-                $i = count( $this->table_aliases );
+                $i     = count( $this->table_aliases );
                 $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
 
@@ -430 +433 @@
                 $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
             }
-
 
             $where = "$alias.term_taxonomy_id $operator ($terms)";
@@ -467 +469 @@
         } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
-            $where = $wpdb->prepare( "$operator (
+            $where = $wpdb->prepare(
+                "$operator (
                 SELECT 1
                 FROM $wpdb->term_relationships
@@ -474 +477 @@
                 WHERE $wpdb->term_taxonomy.taxonomy = %s
                 AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
-            )", $clause['taxonomy'] );
+            )", $clause['taxonomy']
+            );
 
         }
@@ -562 +566 @@
             $this->transform_query( $query, 'term_id' );
 
-            if ( is_wp_error( $query ) )
+            if ( is_wp_error( $query ) ) {
                 return;
+            }
 
             $children = array();
             foreach ( $query['terms'] as $term ) {
-                $children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+                $children   = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
                 $children[] = $term;
             }
@@ -591 +596 @@
      */
     public function transform_query( &$query, $resulting_field ) {
-        if ( empty( $query['terms'] ) )
+        if ( empty( $query['terms'] ) ) {
             return;
-
-        if ( $query['field'] == $resulting_field )
+        }
+
+        if ( $query['field'] == $resulting_field ) {
             return;
+        }
 
         $resulting_field = sanitize_key( $resulting_field );