Changeset 42597 for branches/4.9

Timestamp:

01/24/2018 09:43:17 PM (7 years ago)

Author:

jorbin

Message:

Query: Fix warning on counting non countable

Merges [42581], [42585], and [42594] to the 4.9 branch.

Adds tests to continue the behavior for both null and strings. Skip the tests on PHP 5.2 as they require ReflectionMethod.

See ​https://wiki.php.net/rfc/counting_non_countables for information on the PHP change.

Fixes #42860.
Props dd32 for test skipping and janak007 and ayeshrajans for initial patches.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-query.php (modified) (1 diff)
• tests/phpunit/tests/post/query.php (modified) (1 diff)

branches/4.9/src/wp-includes/class-wp-query.php

@@ -3033 +3033 @@
             $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
         } else {
-            $this->found_posts = count( $this->posts );
+            if ( is_array( $this->posts ) ) {
+                $this->found_posts = count( $this->posts );
+            } else {
+                if ( null === $this->posts ) {  
+                    $this->found_posts = 0;
+                } else {
+                    $this->found_posts = 1;
+                }
+            }
         }
 

branches/4.9/tests/phpunit/tests/post/query.php

@@ -536 +536 @@
         $this->assertEquals( 2, $q->max_num_pages );
     }
+
+    public function set_found_posts_provider() {
+        // count return 0 for null, but 1 for other data you may not expect
+        return array(
+            array( null, 0 ),
+            array( '', 1 ),
+            array( "To life, to life, l'chaim", 1 ),
+            array( false, 1 ),
+        );
+    }
+
+    /**
+     * @ticket 42860
+     *
+     * @dataProvider set_found_posts_provider
+     */
+    public function test_set_found_posts_not_posts_as_an_array( $posts, $expected ) {
+        if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
+            $this->markTestSkipped( 'ReflectionMethod::setAccessible is only available in PHP 5.3+' );
+            return;
+        }
+
+        $q = new WP_Query(
+            array(
+                'post_type'      => 'wptests_pt',
+                'posts_per_page' => 1,
+            )
+        );
+
+        $q->posts = $posts;
+
+        $methd = new \ReflectionMethod( 'WP_Query', 'set_found_posts' );
+        $methd->setAccessible( true );
+        $methd->invoke( $q, array( 'no_found_rows' => false ), array() );
+
+        $this->assertEquals( $expected, $q->found_posts );
+    }
+
 }