Changeset 52973

Timestamp:

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

Author:

SergeyBiryukov

Message:

Coding Standards: Wrap the $this->request property in wp-includes/class-wp-*-query.php.

This aims to improve readability by fitting the values on a single screen to avoid horizontal scrolling.

See #54728.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -961 +961 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
+        $this->request = implode(
+            ' ',
+            array(
+                $this->sql_clauses['select'],
+                $this->sql_clauses['from'],
+                $where,
+                $this->sql_clauses['groupby'],
+                $this->sql_clauses['orderby'],
+                $this->sql_clauses['limits'],
+            )
+        );
 
         if ( $this->query_vars['count'] ) {

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

@@ -481 +481 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
+        $this->request = implode(
+            ' ',
+            array(
+                $this->sql_clauses['select'],
+                $this->sql_clauses['from'],
+                $where,
+                $this->sql_clauses['groupby'],
+                $this->sql_clauses['orderby'],
+                $this->sql_clauses['limits'],
+            )
+        );
 
         if ( $this->query_vars['count'] ) {

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

@@ -3001 +3001 @@
         }
 
-        $old_request   = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
+        $old_request = implode(
+            ' ',
+            array(
+                "SELECT $found_rows $distinct $fields",
+                "FROM {$wpdb->posts} $join",
+                "WHERE 1=1 $where",
+                $groupby,
+                $orderby,
+                $limits,
+            )
+        );
+
         $this->request = $old_request;
 
@@ -3087 +3098 @@
                 // First get the IDs and then fill in the objects.
 
-                $this->request = "SELECT $found_rows $distinct {$wpdb->posts}.ID FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
+                $this->request = implode(
+                    ' ',
+                    array(
+                        "SELECT $found_rows $distinct {$wpdb->posts}.ID",
+                        "FROM {$wpdb->posts} $join",
+                        "WHERE 1=1 $where",
+                        $groupby,
+                        $orderby,
+                        $limits,
+                    )
+                );
 
                 /**

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

@@ -684 +684 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
+        $this->request = implode(
+            ' ',
+            array(
+                $this->sql_clauses['select'],
+                $this->sql_clauses['from'],
+                $where,
+                $this->sql_clauses['groupby'],
+                $this->sql_clauses['orderby'],
+                $this->sql_clauses['limits'],
+            )
+        );
 
         if ( $this->query_vars['count'] ) {

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

@@ -723 +723 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
+        $this->request = implode(
+            ' ',
+            array(
+                $this->sql_clauses['select'],
+                $this->sql_clauses['from'],
+                $where,
+                $this->sql_clauses['orderby'],
+                $this->sql_clauses['limits'],
+            )
+        );
 
         $this->terms = null;

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

@@ -771 +771 @@
 
         if ( null === $this->results ) {
-            $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
+            $this->request = implode(
+                ' ',
+                array(
+                    "SELECT {$this->query_fields}",
+                    $this->query_from,
+                    $this->query_where,
+                    $this->query_orderby,
+                    $this->query_limit,
+                )
+            );
 
             if ( is_array( $qv['fields'] ) || 'all' === $qv['fields'] ) {