Changeset 36381 for trunk/tests/phpunit/tests/comment/query.php

Timestamp:

01/22/2016 08:19:49 PM (8 years ago)

Author:

boonebgorges

Message:

Allow comment query results to be limited to comments with comment_post_ID = 0.

Previously, this was not possible due to an overly broad empty() check.

Passing null, false, or '' to 'post_id', or omitting 'post_id'
altogether, will continue to return comments regardless of comment_post_ID,
as before. Passing 0 or '0' will limit results to comments with no
associated post.

Props danielbachhuber.
Fixes #35090.

File:

• trunk/tests/phpunit/tests/comment/query.php (modified) (2 diffs)

trunk/tests/phpunit/tests/comment/query.php

@@ -37 +37 @@
     }
 
-    public function test_query_post_id_0() {
-        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+    /**
+     * @ticket 35090
+     */
+    public function test_post_id_0_should_return_comments_with_no_parent() {
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
 
         $q = new WP_Comment_Query();
@@ -46 +50 @@
         ) );
 
-        $this->assertEqualSets( array( $c1 ), $found );
+        $this->assertEqualSets( array( $c2 ), $found );
+    }
+
+    /**
+     * @ticket 35090
+     */
+    public function test_post_id_string_0_should_return_comments_with_no_parent() {
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'post_id' => '0',
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $c2 ), $found );
+    }
+
+    /**
+     * @ticket 35090
+     */
+    public function test_post_id_null_should_be_ignored() {
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'post_id' => null,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $c1, $c2 ), $found );
+    }
+
+    /**
+     * @ticket 35090
+     */
+    public function test_post_id_false_should_be_ignored() {
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'post_id' => false,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $c1, $c2 ), $found );
+    }
+
+    /**
+     * @ticket 35090
+     */
+    public function test_post_id_empty_string_should_be_ignored() {
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'post_id' => '',
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $c1, $c2 ), $found );
     }