Coding Standards: Use multi-line strings for the $this->request pro…

…perty in `wp-includes/class-wp-*-query.php`. This further improves the readability by replacing `implode()` calls with string interpolation. Follow-up to [52973]. Props jrf. See #54728. Built from https://develop.svn.wordpress.org/trunk@52977 git-svn-id: http://core.svn.wordpress.org/trunk@52566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Mar 22, 2022 · 6f5f187 · 6f5f187
1 parent 51d4723
commit 6f5f187
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 76 deletions.
diff --git a/wp-includes/class-wp-comment-query.php b/wp-includes/class-wp-comment-query.php
@@ -961,17 +961,14 @@ protected function get_comment_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$this->sql_clauses['limits']  = $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'],
-			)
-		);
+		$this->request = "
+			{$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/wp-includes/class-wp-network-query.php b/wp-includes/class-wp-network-query.php
@@ -480,17 +480,14 @@ protected function get_network_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$this->sql_clauses['limits']  = $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'],
-			)
-		);
+		$this->request = "
+			{$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/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
@@ -3000,17 +3000,14 @@ public function get_posts() {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
-		$old_request = implode(
-			' ',
-			array(
-				"SELECT $found_rows $distinct $fields",
-				"FROM {$wpdb->posts} $join",
-				"WHERE 1=1 $where",
-				$groupby,
-				$orderby,
-				$limits,
-			)
-		);
+		$old_request = "
+			SELECT $found_rows $distinct $fields
+			FROM {$wpdb->posts} $join
+			WHERE 1=1 $where
+			$groupby
+			$orderby
+			$limits
+		";
 
 		$this->request = $old_request;
 
@@ -3097,17 +3094,14 @@ public function get_posts() {
 			if ( $split_the_query ) {
 				// First get the IDs and then fill in the objects.
 
-				$this->request = implode(
-					' ',
-					array(
-						"SELECT $found_rows $distinct {$wpdb->posts}.ID",
-						"FROM {$wpdb->posts} $join",
-						"WHERE 1=1 $where",
-						$groupby,
-						$orderby,
-						$limits,
-					)
-				);
+				$this->request = "
+					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/wp-includes/class-wp-site-query.php b/wp-includes/class-wp-site-query.php
@@ -683,17 +683,14 @@ protected function get_site_ids() {
 		$this->sql_clauses['orderby'] = $orderby;
 		$this->sql_clauses['limits']  = $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'],
-			)
-		);
+		$this->request = "
+			{$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/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
@@ -722,16 +722,13 @@ public function get_terms() {
 		$this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
 		$this->sql_clauses['limits']  = $limits;
 
-		$this->request = implode(
-			' ',
-			array(
-				$this->sql_clauses['select'],
-				$this->sql_clauses['from'],
-				$where,
-				$this->sql_clauses['orderby'],
-				$this->sql_clauses['limits'],
-			)
-		);
+		$this->request = "
+			{$this->sql_clauses['select']}
+			{$this->sql_clauses['from']}
+			{$where}
+			{$this->sql_clauses['orderby']}
+			{$this->sql_clauses['limits']}
+		";
 
 		$this->terms = null;
 

diff --git a/wp-includes/class-wp-user-query.php b/wp-includes/class-wp-user-query.php
@@ -770,16 +770,13 @@ public function query() {
 		$this->results = apply_filters_ref_array( 'users_pre_query', array( null, &$this ) );
 
 		if ( null === $this->results ) {
-			$this->request = implode(
-				' ',
-				array(
-					"SELECT {$this->query_fields}",
-					$this->query_from,
-					$this->query_where,
-					$this->query_orderby,
-					$this->query_limit,
-				)
-			);
+			$this->request = "
+				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 );

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52976';
+$wp_version = '6.0-alpha-52977';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.