Changeset 48840 for trunk/tests/phpunit/tests/term.php

Timestamp:

08/21/2020 10:30:06 PM (5 years ago)

Author:

flixos90

Message:

Taxonomy: Allow for wp_count_terms( $args ) signature, making passing a taxonomy optional.

This brings wp_count_terms() in line with other taxonomy functions such as get_terms() which technically no longer require a taxonomy. Similar to the previously modified functions, no deprecation warning is triggered when using the legacy signature.

Fixes #36399.

File:

• trunk/tests/phpunit/tests/term.php (modified) (4 diffs)

trunk/tests/phpunit/tests/term.php

@@ -66 +66 @@
      */
     function test_wp_count_terms() {
-        $count = wp_count_terms( 'category', array( 'hide_empty' => true ) );
+        $count = wp_count_terms(
+            array(
+                'hide_empty' => true,
+                'taxonomy'   => 'category',
+            )
+        );
         // There are 5 posts, all Uncategorized.
         $this->assertEquals( 1, $count );
+    }
+
+    /**
+     * @ticket 36399
+     */
+    function test_wp_count_terms_legacy_interoperability() {
+        self::factory()->tag->create_many( 5 );
+
+        // Counts all terms (1 default category, 5 tags).
+        $count = wp_count_terms();
+        $this->assertEquals( 6, $count );
+
+        // Counts only tags (5), with both current and legacy signature.
+        // Legacy usage should not trigger deprecated notice.
+        $count        = wp_count_terms( array( 'taxonomy' => 'post_tag' ) );
+        $legacy_count = wp_count_terms( 'post_tag' );
+        $this->assertEquals( 5, $count );
+        $this->assertEquals( $count, $legacy_count );
     }
 
@@ -128 +151 @@
         $this->assertNull( category_exists( $term ) );
 
-        $initial_count = wp_count_terms( 'category' );
+        $initial_count = wp_count_terms( array( 'taxonomy' => 'category' ) );
 
         $t = wp_insert_category( array( 'cat_name' => $term ) );
@@ -134 +157 @@
         $this->assertNotWPError( $t );
         $this->assertTrue( $t > 0 );
-        $this->assertEquals( $initial_count + 1, wp_count_terms( 'category' ) );
+        $this->assertEquals( $initial_count + 1, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
 
         // Make sure the term exists.
@@ -144 +167 @@
         $this->assertNull( term_exists( $term ) );
         $this->assertNull( term_exists( $t ) );
-        $this->assertEquals( $initial_count, wp_count_terms( 'category' ) );
+        $this->assertEquals( $initial_count, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
     }