Merge pull request #20740 from Yoast/20729-wp-64-pattern-categories-are-displayed-in-settings-and-sitemap

20729 wp 64 pattern categories are displayed in settings and sitemap

Author: igorschoester

inc/sitemaps/class-taxonomy-sitemap-provider.php

@@ -287,7 +287,7 @@ public function is_valid_taxonomy( $taxonomy_name ) {
 			return false;
 		}
 
-		if ( in_array( $taxonomy_name, [ 'link_category', 'nav_menu' ], true ) ) {
+		if ( in_array( $taxonomy_name, [ 'link_category', 'nav_menu', 'wp_pattern_category' ], true ) ) {
 			return false;
 		}
 

src/integrations/admin/indexables-exclude-taxonomy-integration.php

@@ -41,13 +41,15 @@ public function register_hooks() {
 	 *
 	 * @param array $excluded_taxonomies The excluded taxonomies.
 	 *
-	 * @return array The excluded post types, including the specific post type.
+	 * @return array The excluded taxonomies, including specific taxonomies.
 	 */
 	public function exclude_taxonomies_for_indexation( $excluded_taxonomies ) {
+		$taxonomies_to_exclude = \array_merge( $excluded_taxonomies, [ 'wp_pattern_category' ] );
+
 		if ( $this->options_helper->get( 'disable-post_format', false ) ) {
-			return \array_merge( $excluded_taxonomies, [ 'post_format' ] );
+			return \array_merge( $taxonomies_to_exclude, [ 'post_format' ] );
 		}
 
-		return $excluded_taxonomies;
+		return $taxonomies_to_exclude;
 	}
 }

tests/integration/sitemaps/test-class-wpseo-taxonomy-sitemap-provider.php

@@ -9,6 +9,7 @@
  * Class WPSEO_Taxonomy_Sitemap_Provider_Test.
  *
  * @group sitemaps
+ * @coversDefaultClass WPSEO_Taxonomy_Sitemap_Provider
  */
 class WPSEO_Taxonomy_Sitemap_Provider_Test extends WPSEO_UnitTestCase {
 
@@ -31,7 +32,7 @@ public function set_up() {
 	/**
 	 * Tests the retrieval of the index links.
 	 *
-	 * @covers WPSEO_Taxonomy_Sitemap_Provider::get_index_links
+	 * @covers ::get_index_links
 	 */
 	public function test_get_index_links() {
 
@@ -57,7 +58,7 @@ public function test_get_index_links() {
 	/**
 	 * Tests retrieval of the sitemap links.
 	 *
-	 * @covers WPSEO_Taxonomy_Sitemap_Provider::get_sitemap_links
+	 * @covers ::get_sitemap_links
 	 */
 	public function test_get_sitemap_links() {
 
@@ -71,7 +72,7 @@ public function test_get_sitemap_links() {
 	/**
 	 * Makes sure invalid sitemap pages return no contents (404).
 	 *
-	 * @covers WPSEO_Taxonomy_Sitemap_Provider::get_index_links
+	 * @covers ::get_index_links
 	 */
 	public function test_get_index_links_empty_sitemap() {
 		// Fetch the global sitemap.
@@ -87,4 +88,44 @@ public function test_get_index_links_empty_sitemap() {
 		// Expect an empty page (404) to be returned.
 		$this->expectOutputString( '' );
 	}
+
+	/**
+	 * Data provider for is_valid_taxonomy test.
+	 *
+	 * @return array
+	 */
+	public function data_provider_is_valis_taxonomy() {
+		return [
+			'Pattern Categories' => [
+				'taxonomy' => 'wp_pattern_category',
+				'expected' => false,
+			],
+			'nav_menu' => [
+				'taxonomy' => 'nav_menu',
+				'expected' => false,
+			],
+			'link_category' => [
+				'taxonomy' => 'link_category',
+				'expected' => false,
+			],
+			'post_format' => [
+				'taxonomy' => 'post_format',
+				'expected' => false,
+			],
+		];
+	}
+
+	/**
+	 * Tetst of is_valid_taxonomy.
+	 *
+	 * @covers ::is_valid_taxonomy
+	 *
+	 * @dataProvider data_provider_is_valis_taxonomy
+	 *
+	 * @param string $taxonomy Taxonomy name.
+	 * @param bool   $expected Expected result.
+	 */
+	public function test_is_valid_taxonomy( $taxonomy, $expected ) {
+		$this->assertSame( $expected, self::$class_instance->is_valid_taxonomy( $taxonomy ) );
+	}
 }