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. git-svn-id: https://develop.svn.wordpress.org/trunk@52973 602fd350-edb4-49c9-b593-d223f7449a82
WordPress · Mar 21, 2022 · fbf8cb7 · fbf8cb7
1 parent 9f2a856
commit fbf8cb7
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 7 deletions.
diff --git a/src/wp-includes/class-wp-comment-query.php b/src/wp-includes/class-wp-comment-query.php
@@ -960,7 +960,17 @@ protected function get_comment_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$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'] ) {
 			return (int) $wpdb->get_var( $this->request );

diff --git a/src/wp-includes/class-wp-network-query.php b/src/wp-includes/class-wp-network-query.php
@@ -480,7 +480,17 @@ protected function get_network_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$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'] ) {
 			return (int) $wpdb->get_var( $this->request );

diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php
@@ -3000,7 +3000,18 @@ public function get_posts() {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
-		$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;
 
 		if ( ! $q['suppress_filters'] ) {
@@ -3086,7 +3097,17 @@ public function get_posts() {
 			if ( $split_the_query ) {
 				// 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,
+					)
+				);
 
 				/**
 				 * Filters the Post IDs SQL request before sending.

diff --git a/src/wp-includes/class-wp-site-query.php b/src/wp-includes/class-wp-site-query.php
@@ -683,7 +683,17 @@ protected function get_site_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$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'] ) {
 			return (int) $wpdb->get_var( $this->request );

diff --git a/src/wp-includes/class-wp-term-query.php b/src/wp-includes/class-wp-term-query.php
@@ -722,7 +722,16 @@ public function get_terms() {
 		$this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
 		$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;
 

diff --git a/src/wp-includes/class-wp-user-query.php b/src/wp-includes/class-wp-user-query.php
@@ -770,7 +770,16 @@ public function query() {
 		$this->results = apply_filters_ref_array( 'users_pre_query', array( null, &$this ) );
 
 		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'] ) {
 				$this->results = $wpdb->get_results( $this->request );