diff --git a/tests/phpunit/tests/link/getDashboardUrl.php b/tests/phpunit/tests/link/getDashboardUrl.php index 7189b598e3..1b70e13a70 100644 --- a/tests/phpunit/tests/link/getDashboardUrl.php +++ b/tests/phpunit/tests/link/getDashboardUrl.php @@ -68,7 +68,7 @@ class Tests_Link_GetDashboardUrl extends WP_UnitTestCase { remove_user_from_blog( self::$user_id, $site_id ); add_user_to_blog( get_current_blog_id(), self::$user_id, 'administrator' ); - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); $this->assertEquals( $expected, $result ); } diff --git a/tests/phpunit/tests/multisite/bootstrap.php b/tests/phpunit/tests/multisite/bootstrap.php index ae71746e63..99d514e965 100644 --- a/tests/phpunit/tests/multisite/bootstrap.php +++ b/tests/phpunit/tests/multisite/bootstrap.php @@ -103,7 +103,7 @@ if ( is_multisite() ) : global $wpdb; foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } foreach ( self::$network_ids as $id ) { diff --git a/tests/phpunit/tests/multisite/getBlogDetails.php b/tests/phpunit/tests/multisite/getBlogDetails.php index 03d33900d8..1ed6b89a83 100644 --- a/tests/phpunit/tests/multisite/getBlogDetails.php +++ b/tests/phpunit/tests/multisite/getBlogDetails.php @@ -35,7 +35,7 @@ if ( is_multisite() ) : public static function wpTearDownAfterClass() { foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } wp_update_network_site_counts(); diff --git a/tests/phpunit/tests/multisite/getIdFromBlogname.php b/tests/phpunit/tests/multisite/getIdFromBlogname.php index 063518b720..ded3cc6ff9 100644 --- a/tests/phpunit/tests/multisite/getIdFromBlogname.php +++ b/tests/phpunit/tests/multisite/getIdFromBlogname.php @@ -72,7 +72,7 @@ if ( is_multisite() ) : global $wpdb; foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } foreach ( self::$network_ids as $id ) { diff --git a/tests/phpunit/tests/multisite/getMainSiteId.php b/tests/phpunit/tests/multisite/getMainSiteId.php index 61435eb353..56fe53f957 100644 --- a/tests/phpunit/tests/multisite/getMainSiteId.php +++ b/tests/phpunit/tests/multisite/getMainSiteId.php @@ -54,7 +54,7 @@ if ( is_multisite() ) : public static function wpTearDownAfterClass() { foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } global $wpdb; diff --git a/tests/phpunit/tests/multisite/getSite.php b/tests/phpunit/tests/multisite/getSite.php index 8f5759445a..aeaa9ddf2e 100644 --- a/tests/phpunit/tests/multisite/getSite.php +++ b/tests/phpunit/tests/multisite/getSite.php @@ -34,7 +34,7 @@ if ( is_multisite() ) : public static function wpTearDownAfterClass() { foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } wp_update_network_site_counts(); diff --git a/tests/phpunit/tests/multisite/network.php b/tests/phpunit/tests/multisite/network.php index f6d0984a1e..9d44116ee8 100644 --- a/tests/phpunit/tests/multisite/network.php +++ b/tests/phpunit/tests/multisite/network.php @@ -63,7 +63,7 @@ if ( is_multisite() ) : global $wpdb; foreach ( self::$different_site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", self::$different_network_id ) ); @@ -155,7 +155,7 @@ if ( is_multisite() ) : $actual = (int) get_blog_count(); // Count only updated when cron runs, so should be unchanged. foreach ( $site_ids as $site_id ) { - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); } wp_update_network_counts(); @@ -175,7 +175,7 @@ if ( is_multisite() ) : remove_filter( 'enable_live_network_counts', '__return_false' ); foreach ( $site_ids as $site_id ) { - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); } wp_update_network_counts(); @@ -195,7 +195,7 @@ if ( is_multisite() ) : remove_filter( 'enable_live_network_counts', '__return_true' ); foreach ( $site_ids as $site_id ) { - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); } wp_update_network_counts(); @@ -590,13 +590,7 @@ if ( is_multisite() ) : public function test_wpmu_create_blog_updates_correct_network_site_count() { $original_count = get_blog_count( self::$different_network_id ); - $site_id = self::factory()->blog->create( - array( - 'domain' => 'example.org', - 'path' => '/', - 'site_id' => self::$different_network_id, - ) - ); + $site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id ); $result = get_blog_count( self::$different_network_id ); diff --git a/tests/phpunit/tests/multisite/site.php b/tests/phpunit/tests/multisite/site.php index 6e94fe28b3..c6cb17fa4c 100644 --- a/tests/phpunit/tests/multisite/site.php +++ b/tests/phpunit/tests/multisite/site.php @@ -79,7 +79,7 @@ if ( is_multisite() ) : add_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10, 1 ); foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } foreach ( self::$network_ids as $id ) { diff --git a/tests/phpunit/tests/multisite/siteDetails.php b/tests/phpunit/tests/multisite/siteDetails.php index 79160ee131..477f8b5ad9 100644 --- a/tests/phpunit/tests/multisite/siteDetails.php +++ b/tests/phpunit/tests/multisite/siteDetails.php @@ -139,7 +139,7 @@ if ( is_multisite() ) : $cached_details = wp_cache_get( $site->id, 'site-details' ); - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); wp_update_network_site_counts(); $this->assertNotFalse( $cached_details ); diff --git a/tests/phpunit/tests/multisite/siteMeta.php b/tests/phpunit/tests/multisite/siteMeta.php index bf272b2c0f..3eee11eb97 100644 --- a/tests/phpunit/tests/multisite/siteMeta.php +++ b/tests/phpunit/tests/multisite/siteMeta.php @@ -41,8 +41,8 @@ if ( is_multisite() ) : delete_network_option( get_main_network_id(), 'site_meta_supported' ); } - wpmu_delete_blog( self::$site_id, true ); - wpmu_delete_blog( self::$site_id2, true ); + wp_delete_site( self::$site_id ); + wp_delete_site( self::$site_id2 ); wp_update_network_site_counts(); } @@ -213,7 +213,7 @@ if ( is_multisite() ) : $this->assertSame( 'bar', get_site_meta( $site_id, 'foo', true ) ); $this->assertSame( 'bar', get_site_meta( $site_id, 'foo1', true ) ); - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); $this->assertSame( '', get_site_meta( $site_id, 'foo', true ) ); $this->assertSame( '', get_site_meta( $site_id, 'foo1', true ) ); diff --git a/tests/phpunit/tests/multisite/siteQuery.php b/tests/phpunit/tests/multisite/siteQuery.php index c8bcff2256..2eaeb906b9 100644 --- a/tests/phpunit/tests/multisite/siteQuery.php +++ b/tests/phpunit/tests/multisite/siteQuery.php @@ -105,7 +105,7 @@ if ( is_multisite() ) : global $wpdb; foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } foreach ( self::$network_ids as $id ) { diff --git a/tests/phpunit/tests/multisite/wpGetSites.php b/tests/phpunit/tests/multisite/wpGetSites.php index f42cbb438e..ee718f1129 100644 --- a/tests/phpunit/tests/multisite/wpGetSites.php +++ b/tests/phpunit/tests/multisite/wpGetSites.php @@ -43,7 +43,7 @@ if ( is_multisite() ) : public static function wpTearDownAfterClass() { foreach ( self::$site_ids as $id ) { - wpmu_delete_blog( $id, true ); + wp_delete_site( $id ); } wp_update_network_site_counts(); diff --git a/tests/phpunit/tests/multisite/wpInstallDefaults.php b/tests/phpunit/tests/multisite/wpInstallDefaults.php index d40930d4e2..dad6a99b84 100644 --- a/tests/phpunit/tests/multisite/wpInstallDefaults.php +++ b/tests/phpunit/tests/multisite/wpInstallDefaults.php @@ -21,7 +21,8 @@ if ( is_multisite() ) : $first_comment = get_comments(); restore_current_blog(); - wpmu_delete_blog( $blog_id, true ); + + wp_delete_site( $blog_id ); $this->assertNotEmpty( $first_page->post_content ); $this->assertNotEmpty( $first_comment[0]->comment_content ); @@ -46,7 +47,8 @@ if ( is_multisite() ) : $first_comment = get_comments(); restore_current_blog(); - wpmu_delete_blog( $blog_id, true ); + + wp_delete_site( $blog_id ); $this->assertNotEmpty( $first_page->post_content ); $this->assertNotEmpty( $first_comment[0]->comment_content ); @@ -71,7 +73,8 @@ if ( is_multisite() ) : $first_comment = get_comments(); restore_current_blog(); - wpmu_delete_blog( $blog_id, true ); + + wp_delete_site( $blog_id ); $this->assertEquals( 'Some page content', $first_page->post_content ); $this->assertEquals( 'Some comment content', $first_comment[0]->comment_content ); diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMSSitesListTable.php index dffa8d82af..39c9161a30 100644 --- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php +++ b/tests/phpunit/tests/multisite/wpMSSitesListTable.php @@ -83,7 +83,7 @@ if ( is_multisite() ) : public static function wpTearDownAfterClass() { foreach ( self::$site_ids as $site_id ) { - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); } } diff --git a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php index 892fd521da..a635287b14 100644 --- a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php +++ b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php @@ -47,7 +47,7 @@ if ( is_multisite() ) : wpmu_delete_user( self::$existing_user_id ); - wpmu_delete_blog( self::$existing_blog_id, true ); + wp_delete_site( self::$existing_blog_id ); } /** diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php index c678ce63bd..6b1bd39854 100644 --- a/tests/phpunit/tests/rest-api/rest-users-controller.php +++ b/tests/phpunit/tests/rest-api/rest-users-controller.php @@ -136,7 +136,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase { _unregister_post_type( 'r_false_p_false' ); if ( is_multisite() ) { - wpmu_delete_blog( self::$site, true ); + wp_delete_site( self::$site ); } // Remove users for pagination tests. diff --git a/tests/phpunit/tests/user/getActiveBlogForUser.php b/tests/phpunit/tests/user/getActiveBlogForUser.php index d6e792e26c..c6a04b5ea6 100644 --- a/tests/phpunit/tests/user/getActiveBlogForUser.php +++ b/tests/phpunit/tests/user/getActiveBlogForUser.php @@ -51,8 +51,8 @@ if ( is_multisite() ) : $result = get_active_blog_for_user( self::$user_id ); - wpmu_delete_blog( $site_id_one, true ); - wpmu_delete_blog( $site_id_two, true ); + wp_delete_site( $site_id_one ); + wp_delete_site( $site_id_two ); $this->assertEquals( $primary_site_id, $result->id ); } @@ -69,7 +69,7 @@ if ( is_multisite() ) : $result = get_active_blog_for_user( self::$user_id ); - wpmu_delete_blog( $primary_site_id, true ); + wp_delete_site( $primary_site_id ); $this->assertEquals( $primary_site_id, $result->id ); } @@ -92,7 +92,7 @@ if ( is_multisite() ) : $result = get_active_blog_for_user( self::$user_id ); - wpmu_delete_blog( $site_id, true ); + wp_delete_site( $site_id ); $this->assertEquals( $current_site_id, $result->id ); } diff --git a/tests/phpunit/tests/user/multisite.php b/tests/phpunit/tests/user/multisite.php index 01c7b7d096..9e31661253 100644 --- a/tests/phpunit/tests/user/multisite.php +++ b/tests/phpunit/tests/user/multisite.php @@ -389,7 +389,7 @@ if ( is_multisite() ) : $user = get_user_by( 'id', $user_id ); restore_current_blog(); - wpmu_delete_blog( $site_id ); + wp_delete_site( $site_id ); wpmu_delete_user( $user_id ); $this->assertContains( 'subscriber', $user->roles ); @@ -402,7 +402,8 @@ if ( is_multisite() ) : $site_id = self::factory()->blog->create(); $result = add_user_to_blog( 73622, $site_id, 'subscriber' ); - wpmu_delete_blog( $site_id ); + + wp_delete_site( $site_id ); $this->assertWPError( $result ); }