From db4351fa95de47dd304753154a6cb1bad59db83b Mon Sep 17 00:00:00 2001 From: Paul Biron Date: Tue, 21 Jul 2020 09:42:53 -0600 Subject: [PATCH] no message --- src/wp-includes/sitemaps.php | 2 +- tests/phpunit/tests/sitemaps/functions.php | 4 ++-- .../tests/sitemaps/sitemaps-registry.php | 18 +++++++++--------- tests/phpunit/tests/sitemaps/sitemaps.php | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/wp-includes/sitemaps.php b/src/wp-includes/sitemaps.php index f556246be5..b0a1dc4dbd 100644 --- a/src/wp-includes/sitemaps.php +++ b/src/wp-includes/sitemaps.php @@ -51,7 +51,7 @@ function wp_sitemaps_get_server() { * * @return WP_Sitemaps_Provider[] Array of sitemap providers. */ -function wp_get_sitemaps() { +function wp_get_sitemaps_providers() { $sitemaps = wp_sitemaps_get_server(); if ( ! $sitemaps ) { diff --git a/tests/phpunit/tests/sitemaps/functions.php b/tests/phpunit/tests/sitemaps/functions.php index dd4796b438..2c4cce5a35 100644 --- a/tests/phpunit/tests/sitemaps/functions.php +++ b/tests/phpunit/tests/sitemaps/functions.php @@ -43,8 +43,8 @@ class Test_Sitemaps_Functions extends WP_UnitTestCase { /** * Test wp_get_sitemaps default functionality */ - public function test_wp_get_sitemaps() { - $sitemaps = wp_get_sitemaps(); + public function test_wp_get_sitemaps_providers() { + $sitemaps = wp_get_sitemaps_providers(); $expected = array( 'posts' => 'WP_Sitemaps_Posts', diff --git a/tests/phpunit/tests/sitemaps/sitemaps-registry.php b/tests/phpunit/tests/sitemaps/sitemaps-registry.php index faeba78852..b5ac7e952c 100644 --- a/tests/phpunit/tests/sitemaps/sitemaps-registry.php +++ b/tests/phpunit/tests/sitemaps/sitemaps-registry.php @@ -8,12 +8,12 @@ class Test_WP_Sitemaps_Registry extends WP_UnitTestCase { $provider = new WP_Sitemaps_Test_Provider(); $registry = new WP_Sitemaps_Registry(); - $actual = $registry->add_provider( 'foo', $provider ); - $sitemaps = $registry->get_providers(); + $actual = $registry->add_provider( 'foo', $provider ); + $providers = $registry->get_providers(); $this->assertTrue( $actual ); - $this->assertCount( 1, $sitemaps ); - $this->assertSame( $sitemaps['foo'], $provider, 'Can not confirm sitemap registration is working.' ); + $this->assertCount( 1, $providers ); + $this->assertSame( $providers['foo'], $provider, 'Can not confirm sitemap registration is working.' ); } public function test_add_provider_prevent_duplicates() { @@ -21,13 +21,13 @@ class Test_WP_Sitemaps_Registry extends WP_UnitTestCase { $provider2 = new WP_Sitemaps_Test_Provider(); $registry = new WP_Sitemaps_Registry(); - $actual1 = $registry->add_provider( 'foo', $provider1 ); - $actual2 = $registry->add_provider( 'foo', $provider2 ); - $sitemaps = $registry->get_providers(); + $actual1 = $registry->add_provider( 'foo', $provider1 ); + $actual2 = $registry->add_provider( 'foo', $provider2 ); + $providers = $registry->get_providers(); $this->assertTrue( $actual1 ); $this->assertFalse( $actual2 ); - $this->assertCount( 1, $sitemaps ); - $this->assertSame( $sitemaps['foo'], $provider1, 'Can not confirm sitemap registration is working.' ); + $this->assertCount( 1, $providers ); + $this->assertSame( $providers['foo'], $provider1, 'Can not confirm sitemap registration is working.' ); } } diff --git a/tests/phpunit/tests/sitemaps/sitemaps.php b/tests/phpunit/tests/sitemaps/sitemaps.php index 35a5d6e8b6..d00e89d163 100644 --- a/tests/phpunit/tests/sitemaps/sitemaps.php +++ b/tests/phpunit/tests/sitemaps/sitemaps.php @@ -100,7 +100,7 @@ class Test_Sitemaps extends WP_UnitTestCase { public function _get_sitemap_entries() { $entries = array(); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); foreach ( $providers as $provider ) { // Using `array_push` is more efficient than `array_merge` in the loop. @@ -218,7 +218,7 @@ class Test_Sitemaps extends WP_UnitTestCase { * Tests getting a URL list for post type post. */ public function test_get_url_list_post() { - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, 'post' ); @@ -234,7 +234,7 @@ class Test_Sitemaps extends WP_UnitTestCase { // Short circuit the show on front option. add_filter( 'pre_option_show_on_front', '__return_true' ); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, 'page' ); @@ -247,7 +247,7 @@ class Test_Sitemaps extends WP_UnitTestCase { * Tests getting a URL list for post type page with included home page. */ public function test_get_url_list_page_with_home() { - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, 'page' ); @@ -270,7 +270,7 @@ class Test_Sitemaps extends WP_UnitTestCase { public function test_get_url_list_private_post() { wp_set_current_user( self::$editor_id ); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list_before = $providers['posts']->get_url_list( 1, 'post' ); @@ -297,7 +297,7 @@ class Test_Sitemaps extends WP_UnitTestCase { $ids = self::factory()->post->create_many( 10, array( 'post_type' => $post_type ) ); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, $post_type ); @@ -320,7 +320,7 @@ class Test_Sitemaps extends WP_UnitTestCase { self::factory()->post->create_many( 10, array( 'post_type' => $post_type ) ); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, $post_type ); @@ -348,7 +348,7 @@ class Test_Sitemaps extends WP_UnitTestCase { self::factory()->post->create_many( 10, array( 'post_type' => $post_type ) ); - $providers = wp_get_sitemaps(); + $providers = wp_get_sitemaps_providers(); $post_list = $providers['posts']->get_url_list( 1, $post_type ); @@ -391,7 +391,7 @@ class Test_Sitemaps extends WP_UnitTestCase { public function test_register_sitemap_provider() { wp_register_sitemap( 'test_sitemap', self::$test_provider ); - $sitemaps = wp_get_sitemaps(); + $sitemaps = wp_get_sitemaps_providers(); $this->assertEquals( $sitemaps['test_sitemap'], self::$test_provider, 'Can not confirm sitemap registration is working.' ); } -- 2.26.2.windows.1