Changeset 34205

Timestamp:

09/15/2015 04:22:34 PM (9 years ago)

Author:

wonderboymusic

Message:

Add parent__in and parent__not_in query vars to WP_Comment_Query.

Adds unit tests.

Fixes #33882.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (3 diffs)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -93 +93 @@
      * Sets up the comment query, based on the query vars passed.
      *
-     * @since  4.2.0
+     * @since 4.2.0
+     * @since 4.4.0 `$parent__in` and `$parent__not_in` were added.
      * @access public
      *
@@ -137 +138 @@
      *                                             Default: 'DESC'.
      *     @type int          $parent              Parent ID of comment to retrieve children of. Default empty.
+     *     @type array        $parent__in          Array of parent IDs of comments to retrieve children for. Default empty.
+     *     @type array        $parent__not_in      Array of parent IDs of comments *not* to retrieve children for. Default empty.
      *     @type array        $post_author__in     Array of author IDs to retrieve comments for. Default empty.
      *     @type array        $post_author__not_in Array of author IDs *not* to retrieve comments for. Default empty.
@@ -487 +490 @@
         }
 
+        // Parse comment parent IDs for an IN clause.
+        if ( ! empty( $this->query_vars['parent__in'] ) ) {
+            $where[] = 'comment_parent IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__in'] ) ) . ' )';
+        }
+
+        // Parse comment parent IDs for a NOT IN clause.
+        if ( ! empty( $this->query_vars['parent__not_in'] ) ) {
+            $where[] = 'comment_parent NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__not_in'] ) ) . ' )';
+        }
+
         // Parse comment post IDs for an IN clause.
         if ( ! empty( $this->query_vars['post__in'] ) ) {

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

@@ -1738 +1738 @@
         $q->query_vars['meta_value'] = 'bar';
     }
+
+    /**
+     * @ticket 33882
+     */
+    public function test_parent__in() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+        $c2 = $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c1,
+        ) );
+
+        $ids = new WP_Comment_Query( array(
+            'comment_post_ID' => $this->post_id,
+            'fields' => 'ids',
+            'parent__in' => array( $c1 )
+        ) );
+
+        $this->assertEqualSets( array( $c2 ), $ids->comments );
+    }
+
+    /**
+     * @ticket 33882
+     */
+    public function test_parent__in_commas() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+        $c2 = $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1'
+        ) );
+        $c3 = $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c1,
+        ) );
+        $c4 = $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c2,
+        ) );
+
+        $ids = new WP_Comment_Query( array(
+            'comment_post_ID' => $this->post_id,
+            'fields' => 'ids',
+            'parent__in' => "$c1,$c2"
+        ) );
+
+        $this->assertEqualSets( array( $c3, $c4 ), $ids->comments );
+    }
+
+    /**
+     * @ticket 33882
+     */
+    public function test_parent__not_in() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+
+        $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c1,
+        ) );
+
+        $ids = new WP_Comment_Query( array(
+            'comment_post_ID' => $this->post_id,
+            'fields' => 'ids',
+            'parent__not_in' => array( $c1 )
+        ) );
+
+        $this->assertEqualSets( array( $c1 ), $ids->comments );
+    }
+
+    /**
+     * @ticket 33882
+     */
+    public function test_parent__not_in_commas() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+        $c2 = $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1'
+        ) );
+
+        $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c1,
+        ) );
+        $this->factory->comment->create( array(
+            'comment_post_ID' => $this->post_id,
+            'comment_approved' => '1',
+            'comment_parent' => $c2,
+        ) );
+
+        $ids = new WP_Comment_Query( array(
+            'comment_post_ID' => $this->post_id,
+            'fields' => 'ids',
+            'parent__not_in' => "$c1,$c2"
+        ) );
+
+        $this->assertEqualSets( array( $c1, $c2 ), $ids->comments );
+    }
 }