Posts, Post Types: Refactor preparation of query for wp_count_posts().

Follow-up to [60788].

Props mukesh27, westonruter.
See #61097.


git-svn-id: https://develop.svn.wordpress.org/trunk@60792 602fd350-edb4-49c9-b593-d223f7449a82

Author: westonruter

src/wp-includes/post.php

@@ -3406,8 +3406,7 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 		! current_user_can( get_post_type_object( $type )->cap->read_private_posts )
 	) {
 		// Optimized query uses subqueries which can leverage DB indexes for better performance. See #61097.
-		$query = $wpdb->prepare(
-			"
+		$query = "
 			SELECT post_status, COUNT(*) AS num_posts
 			FROM (
 				SELECT post_status
@@ -3418,24 +3417,23 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 				FROM {$wpdb->posts}
 				WHERE post_type = %s AND post_status = 'private' AND post_author = %d
 			) AS filtered_posts
-			",
-			$type,
-			$type,
-			get_current_user_id()
-		);
+		";
+		$args  = array( $type, $type, get_current_user_id() );
 	} else {
-		$query = $wpdb->prepare(
-			"
+		$query = "
 			SELECT post_status, COUNT(*) AS num_posts
 			FROM {$wpdb->posts}
 			WHERE post_type = %s
-			",
-			$type
-		);
+		";
+		$args  = array( $type );
 	}
 
-	$query  .= ' GROUP BY post_status';
-	$results = (array) $wpdb->get_results( $query, ARRAY_A );
+	$query .= ' GROUP BY post_status';
+
+	$results = (array) $wpdb->get_results(
+		$wpdb->prepare( $query, ...$args ), // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Placeholders are used in the string contained in the variable.
+		ARRAY_A
+	);
 	$counts  = array_fill_keys( get_post_stati(), 0 );
 
 	foreach ( $results as $row ) {

tests/phpunit/tests/post.php

@@ -196,6 +196,7 @@ public function test_wp_count_posts() {
 	 * read private posts.
 	 *
 	 * @ticket 61097
+	 *
 	 * @covers ::wp_count_posts
 	 */
 	public function test_wp_count_posts_readable_excludes_unreadable_private_posts() {
@@ -222,8 +223,7 @@ public function test_wp_count_posts_readable_excludes_unreadable_private_posts()
 			)
 		);
 
-		$current_user_id = self::$user_ids['author'];
-		wp_set_current_user( $current_user_id );
+		wp_set_current_user( self::$user_ids['author'] );
 
 		$count = wp_count_posts( $post_type, 'readable' );
 		$this->assertEquals( 5, $count->publish );