Changeset 60148 for trunk/tests/phpunit/tests/multisite/site.php

Timestamp:

04/09/2025 01:29:39 PM (6 weeks ago)

Author:

SergeyBiryukov

Message:

Tests: Use the ms-required group where appropriate.

This replaces the if ( is_multisite() ) conditional wrapping entire test classes with the ms-required group for more consistency across the test suite.

Follow-up to [40520].

See #63167.

File:

• trunk/tests/phpunit/tests/multisite/site.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/site.php

@@ -1 +1 @@
 <?php
 
-if ( is_multisite() ) :
-
-    /**
-     * Tests specific to sites in multisite.
-     *
-     * @group ms-site
-     * @group multisite
-     */
-    class Tests_Multisite_Site extends WP_UnitTestCase {
-        protected $suppress                = false;
-        protected $site_status_hooks       = array();
-        protected $wp_initialize_site_args = array();
-        protected $wp_initialize_site_meta = array();
-        protected static $network_ids;
-        protected static $site_ids;
-        protected static $uninitialized_site_id;
-
-        public function set_up() {
-            global $wpdb;
-            parent::set_up();
-            $this->suppress = $wpdb->suppress_errors();
+/**
+ * Tests specific to sites in multisite.
+ *
+ * @group ms-required
+ * @group ms-site
+ * @group multisite
+ */
+class Tests_Multisite_Site extends WP_UnitTestCase {
+    protected $suppress                = false;
+    protected $site_status_hooks       = array();
+    protected $wp_initialize_site_args = array();
+    protected $wp_initialize_site_meta = array();
+    protected static $network_ids;
+    protected static $site_ids;
+    protected static $uninitialized_site_id;
+
+    public function set_up() {
+        global $wpdb;
+        parent::set_up();
+        $this->suppress = $wpdb->suppress_errors();
+    }
+
+    public function tear_down() {
+        global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
+        parent::tear_down();
+    }
+
+    public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+        self::$network_ids = array(
+            'make.wordpress.org/' => array(
+                'domain' => 'make.wordpress.org',
+                'path'   => '/',
+            ),
+        );
+
+        foreach ( self::$network_ids as &$id ) {
+            $id = $factory->network->create( $id );
         }
-
-        public function tear_down() {
-            global $wpdb;
-            $wpdb->suppress_errors( $this->suppress );
-            parent::tear_down();
+        unset( $id );
+
+        self::$site_ids = array(
+            'make.wordpress.org/'     => array(
+                'domain'     => 'make.wordpress.org',
+                'path'       => '/',
+                'network_id' => self::$network_ids['make.wordpress.org/'],
+            ),
+            'make.wordpress.org/foo/' => array(
+                'domain'     => 'make.wordpress.org',
+                'path'       => '/foo/',
+                'network_id' => self::$network_ids['make.wordpress.org/'],
+            ),
+        );
+
+        foreach ( self::$site_ids as &$id ) {
+            $id = $factory->blog->create( $id );
         }
-
-        public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-            self::$network_ids = array(
-                'make.wordpress.org/' => array(
-                    'domain' => 'make.wordpress.org',
-                    'path'   => '/',
-                ),
-            );
-
-            foreach ( self::$network_ids as &$id ) {
-                $id = $factory->network->create( $id );
-            }
-            unset( $id );
-
-            self::$site_ids = array(
-                'make.wordpress.org/'     => array(
-                    'domain'     => 'make.wordpress.org',
-                    'path'       => '/',
-                    'network_id' => self::$network_ids['make.wordpress.org/'],
-                ),
-                'make.wordpress.org/foo/' => array(
-                    'domain'     => 'make.wordpress.org',
-                    'path'       => '/foo/',
-                    'network_id' => self::$network_ids['make.wordpress.org/'],
-                ),
-            );
-
-            foreach ( self::$site_ids as &$id ) {
-                $id = $factory->blog->create( $id );
-            }
-            unset( $id );
-
-            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-            self::$uninitialized_site_id = wp_insert_site(
-                array(
-                    'domain'     => 'uninitialized.org',
-                    'path'       => '/',
-                    'network_id' => self::$network_ids['make.wordpress.org/'],
-                )
-            );
-            add_action( 'wp_initialize_site', 'wp_initialize_site', 10, 2 );
+        unset( $id );
+
+        remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+        self::$uninitialized_site_id = wp_insert_site(
+            array(
+                'domain'     => 'uninitialized.org',
+                'path'       => '/',
+                'network_id' => self::$network_ids['make.wordpress.org/'],
+            )
+        );
+        add_action( 'wp_initialize_site', 'wp_initialize_site', 10, 2 );
+    }
+
+    public static function wpTearDownAfterClass() {
+        global $wpdb;
+
+        remove_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10 );
+        wp_delete_site( self::$uninitialized_site_id );
+        add_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10, 1 );
+
+        foreach ( self::$site_ids as $id ) {
+            wp_delete_site( $id );
         }
 
-        public static function wpTearDownAfterClass() {
-            global $wpdb;
-
-            remove_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10 );
-            wp_delete_site( self::$uninitialized_site_id );
-            add_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10, 1 );
-
-            foreach ( self::$site_ids as $id ) {
-                wp_delete_site( $id );
-            }
-
-            foreach ( self::$network_ids as $id ) {
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
+        foreach ( self::$network_ids as $id ) {
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
+        }
+    }
+
+    public function test_switch_restore_blog() {
+        global $_wp_switched_stack, $wpdb;
+
+        $this->assertSame( array(), $_wp_switched_stack );
+        $this->assertFalse( ms_is_switched() );
+        $current_blog_id = get_current_blog_id();
+        $this->assertIsInt( $current_blog_id );
+
+        wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
+        $this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
+
+        $blog_id = self::factory()->blog->create();
+
+        $cap_key = wp_get_current_user()->cap_key;
+        switch_to_blog( $blog_id );
+        $this->assertNotEquals( $cap_key, wp_get_current_user()->cap_key );
+        $this->assertSame( array( $current_blog_id ), $_wp_switched_stack );
+        $this->assertTrue( ms_is_switched() );
+        $this->assertSame( $blog_id, $wpdb->blogid );
+        $this->assertFalse( wp_cache_get( 'switch-test', 'switch-test' ) );
+        wp_cache_set( 'switch-test', $blog_id, 'switch-test' );
+        $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
+
+        switch_to_blog( $blog_id );
+        $this->assertSame( array( $current_blog_id, $blog_id ), $_wp_switched_stack );
+        $this->assertTrue( ms_is_switched() );
+        $this->assertSame( $blog_id, $wpdb->blogid );
+        $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
+
+        restore_current_blog();
+        $this->assertSame( array( $current_blog_id ), $_wp_switched_stack );
+        $this->assertTrue( ms_is_switched() );
+        $this->assertSame( $blog_id, $wpdb->blogid );
+        $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
+
+        restore_current_blog();
+        $this->assertSame( $cap_key, wp_get_current_user()->cap_key );
+        $this->assertSame( $current_blog_id, get_current_blog_id() );
+        $this->assertSame( array(), $_wp_switched_stack );
+        $this->assertFalse( ms_is_switched() );
+        $this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
+
+        $this->assertFalse( restore_current_blog() );
+    }
+
+    /**
+     * Test the cache keys and database tables setup through the creation of a site.
+     */
+    public function test_created_site_details() {
+        global $wpdb;
+
+        $blog_id = self::factory()->blog->create();
+
+        $this->assertIsInt( $blog_id );
+        $prefix = $wpdb->get_blog_prefix( $blog_id );
+
+        // $get_all = false, only retrieve details from the blogs table.
+        $details = get_blog_details( $blog_id, false );
+
+        // Combine domain and path for a site specific cache key.
+        $key = md5( $details->domain . $details->path );
+
+        $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+
+        // get_blogaddress_by_name().
+        $this->assertSame( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
+
+        // These are empty until get_blog_details() is called with $get_all = true.
+        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
+
+        // $get_all = true, populate the full blog-details cache and the blog slug lookup cache.
+        $details = get_blog_details( $blog_id, true );
+        $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
+        $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
+
+        // Check existence of each database table for the created site.
+        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+            $suppress = $wpdb->suppress_errors();
+
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+
+            $wpdb->suppress_errors( $suppress );
+
+            // The table should exist.
+            $this->assertNotEmpty( $table_fields );
+
+            // And the table should not be empty, unless commentmeta, termmeta, or links.
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
+
+            if ( 'commentmeta' === $table || 'termmeta' === $table || 'links' === $table ) {
+                $this->assertEmpty( $result );
+            } else {
+                $this->assertNotEmpty( $result );
             }
         }
 
-        public function test_switch_restore_blog() {
-            global $_wp_switched_stack, $wpdb;
-
-            $this->assertSame( array(), $_wp_switched_stack );
-            $this->assertFalse( ms_is_switched() );
-            $current_blog_id = get_current_blog_id();
-            $this->assertIsInt( $current_blog_id );
-
-            wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
-            $this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
-
-            $blog_id = self::factory()->blog->create();
-
-            $cap_key = wp_get_current_user()->cap_key;
-            switch_to_blog( $blog_id );
-            $this->assertNotEquals( $cap_key, wp_get_current_user()->cap_key );
-            $this->assertSame( array( $current_blog_id ), $_wp_switched_stack );
-            $this->assertTrue( ms_is_switched() );
-            $this->assertSame( $blog_id, $wpdb->blogid );
-            $this->assertFalse( wp_cache_get( 'switch-test', 'switch-test' ) );
-            wp_cache_set( 'switch-test', $blog_id, 'switch-test' );
-            $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
-
-            switch_to_blog( $blog_id );
-            $this->assertSame( array( $current_blog_id, $blog_id ), $_wp_switched_stack );
-            $this->assertTrue( ms_is_switched() );
-            $this->assertSame( $blog_id, $wpdb->blogid );
-            $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
-
-            restore_current_blog();
-            $this->assertSame( array( $current_blog_id ), $_wp_switched_stack );
-            $this->assertTrue( ms_is_switched() );
-            $this->assertSame( $blog_id, $wpdb->blogid );
-            $this->assertSame( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
-
-            restore_current_blog();
-            $this->assertSame( $cap_key, wp_get_current_user()->cap_key );
-            $this->assertSame( $current_blog_id, get_current_blog_id() );
-            $this->assertSame( array(), $_wp_switched_stack );
-            $this->assertFalse( ms_is_switched() );
-            $this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
-
-            $this->assertFalse( restore_current_blog() );
+        // Update the blog count cache to use get_blog_count().
+        wp_update_network_counts();
+        $this->assertSame( 2, (int) get_blog_count() );
+    }
+
+    public function test_site_caches_should_invalidate_when_invalidation_is_not_suspended() {
+        $site_id = self::factory()->blog->create();
+
+        $details = get_site( $site_id );
+
+        $suspend = wp_suspend_cache_invalidation( false );
+        update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
+        $new_details = get_site( $site_id );
+        wp_suspend_cache_invalidation( $suspend );
+
+        $this->assertNotEquals( $details->path, $new_details->path );
+    }
+
+    public function test_site_caches_should_not_invalidate_when_invalidation_is_suspended() {
+        $site_id = self::factory()->blog->create();
+
+        $details = get_site( $site_id );
+
+        $suspend = wp_suspend_cache_invalidation();
+        update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
+        $new_details = get_site( $site_id );
+        wp_suspend_cache_invalidation( $suspend );
+
+        $this->assertSame( $details->path, $new_details->path );
+    }
+
+    /**
+     * When a site is flagged as 'deleted', its data should be cleared from cache.
+     */
+    public function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
+        $blog_id = self::factory()->blog->create();
+
+        $details = get_blog_details( $blog_id, false );
+        $key     = md5( $details->domain . $details->path );
+
+        // Delete the site without forcing a table drop.
+        wpmu_delete_blog( $blog_id, false );
+
+        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * When a site is flagged as 'deleted', its data should remain in the database.
+     */
+    public function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
+        global $wpdb;
+
+        $blog_id = self::factory()->blog->create();
+
+        // Delete the site without forcing a table drop.
+        wpmu_delete_blog( $blog_id, false );
+
+        $prefix = $wpdb->get_blog_prefix( $blog_id );
+        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+            $suppress = $wpdb->suppress_errors();
+
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+
+            $wpdb->suppress_errors( $suppress );
+            $this->assertNotEmpty( $table_fields, $prefix . $table );
         }
-
-        /**
-         * Test the cache keys and database tables setup through the creation of a site.
-         */
-        public function test_created_site_details() {
-            global $wpdb;
-
-            $blog_id = self::factory()->blog->create();
-
-            $this->assertIsInt( $blog_id );
-            $prefix = $wpdb->get_blog_prefix( $blog_id );
-
-            // $get_all = false, only retrieve details from the blogs table.
-            $details = get_blog_details( $blog_id, false );
-
-            // Combine domain and path for a site specific cache key.
-            $key = md5( $details->domain . $details->path );
-
-            $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-
-            // get_blogaddress_by_name().
-            $this->assertSame( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
-
-            // These are empty until get_blog_details() is called with $get_all = true.
-            $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
-
-            // $get_all = true, populate the full blog-details cache and the blog slug lookup cache.
-            $details = get_blog_details( $blog_id, true );
-            $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
-            $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
-
-            // Check existence of each database table for the created site.
-            foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                $suppress = $wpdb->suppress_errors();
-
-                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-
-                $wpdb->suppress_errors( $suppress );
-
-                // The table should exist.
-                $this->assertNotEmpty( $table_fields );
-
-                // And the table should not be empty, unless commentmeta, termmeta, or links.
-                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-                $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
-
-                if ( 'commentmeta' === $table || 'termmeta' === $table || 'links' === $table ) {
-                    $this->assertEmpty( $result );
-                } else {
-                    $this->assertNotEmpty( $result );
-                }
-            }
-
-            // Update the blog count cache to use get_blog_count().
-            wp_update_network_counts();
-            $this->assertSame( 2, (int) get_blog_count() );
+    }
+
+    /**
+     * When a site is fully deleted, its data should be cleared from cache.
+     */
+    public function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
+        $blog_id = self::factory()->blog->create();
+
+        $details = get_blog_details( $blog_id, false );
+        $key     = md5( $details->domain . $details->path );
+
+        // Delete the site and force a table drop.
+        wpmu_delete_blog( $blog_id, true );
+
+        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * When a site is fully deleted, its data should be removed from the database.
+     */
+    public function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
+        global $wpdb;
+
+        $blog_id = self::factory()->blog->create();
+
+        // Delete the site and force a table drop.
+        wpmu_delete_blog( $blog_id, true );
+
+        $prefix = $wpdb->get_blog_prefix( $blog_id );
+        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+            $suppress = $wpdb->suppress_errors();
+
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+
+            $wpdb->suppress_errors( $suppress );
+            $this->assertEmpty( $table_fields );
         }
-
-        public function test_site_caches_should_invalidate_when_invalidation_is_not_suspended() {
-            $site_id = self::factory()->blog->create();
-
-            $details = get_site( $site_id );
-
-            $suspend = wp_suspend_cache_invalidation( false );
-            update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
-            $new_details = get_site( $site_id );
-            wp_suspend_cache_invalidation( $suspend );
-
-            $this->assertNotEquals( $details->path, $new_details->path );
+    }
+
+    /**
+     * When the main site of a network is fully deleted, its data should be cleared from cache.
+     */
+    public function test_data_in_cache_after_wpmu_delete_blog_main_site_drop_true() {
+        $blog_id = 1; // The main site in our test suite has an ID of 1.
+
+        $details = get_blog_details( $blog_id, false );
+        $key     = md5( $details->domain . $details->path );
+
+        // Delete the site and force a table drop.
+        wpmu_delete_blog( $blog_id, true );
+
+        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * When the main site of a network is fully deleted, its data should remain in the database.
+     */
+    public function test_data_in_tables_after_wpmu_delete_blog_main_site_drop_true() {
+        global $wpdb;
+
+        $blog_id = 1; // The main site in our test suite has an ID of 1.
+
+        // Delete the site and force a table drop.
+        wpmu_delete_blog( $blog_id, true );
+
+        $prefix = $wpdb->get_blog_prefix( $blog_id );
+        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+            $suppress = $wpdb->suppress_errors();
+
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+
+            $wpdb->suppress_errors( $suppress );
+            $this->assertNotEmpty( $table_fields, $prefix . $table );
         }
-
-        public function test_site_caches_should_not_invalidate_when_invalidation_is_suspended() {
-            $site_id = self::factory()->blog->create();
-
-            $details = get_site( $site_id );
-
-            $suspend = wp_suspend_cache_invalidation();
-            update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
-            $new_details = get_site( $site_id );
-            wp_suspend_cache_invalidation( $suspend );
-
-            $this->assertSame( $details->path, $new_details->path );
+    }
+
+    /**
+     * The site count of a network should change when a site is flagged as 'deleted'.
+     */
+    public function test_network_count_after_wpmu_delete_blog_drop_false() {
+        $blog_id = self::factory()->blog->create();
+
+        // Delete the site without forcing a table drop.
+        wpmu_delete_blog( $blog_id, false );
+
+        // Update the blog count cache to use get_blog_count().
+        wp_update_network_counts();
+        $this->assertSame( 1, get_blog_count() );
+    }
+
+    /**
+     * The site count of a network should change when a site is fully deleted.
+     */
+    public function test_blog_count_after_wpmu_delete_blog_drop_true() {
+        $blog_id = self::factory()->blog->create();
+
+        // Delete the site and force a table drop.
+        wpmu_delete_blog( $blog_id, true );
+
+        // Update the blog count cache to use get_blog_count().
+        wp_update_network_counts();
+        $this->assertSame( 1, get_blog_count() );
+    }
+
+    /**
+     * When a site is deleted with wpmu_delete_blog(), only the files associated with
+     * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
+     * should change with upload directories.
+     */
+    public function test_upload_directories_after_multiple_wpmu_delete_blog() {
+        $filename = __FUNCTION__ . '.jpg';
+        $contents = __FUNCTION__ . '_contents';
+
+        // Upload a file to the main site on the network.
+        $file1 = wp_upload_bits( $filename, null, $contents );
+
+        $blog_id = self::factory()->blog->create();
+
+        switch_to_blog( $blog_id );
+        $file2 = wp_upload_bits( $filename, null, $contents );
+        restore_current_blog();
+
+        wpmu_delete_blog( $blog_id, true );
+
+        // The file on the main site should still exist. The file on the deleted site should not.
+        $this->assertFileExists( $file1['file'] );
+        $this->assertFileDoesNotExist( $file2['file'] );
+
+        wpmu_delete_blog( $blog_id, true );
+
+        // The file on the main site should still exist. The file on the deleted site should not.
+        $this->assertFileExists( $file1['file'] );
+        $this->assertFileDoesNotExist( $file2['file'] );
+
+        unlink( $file1['file'] );
+    }
+
+    public function test_wpmu_update_blogs_date() {
+        global $wpdb;
+
+        wpmu_update_blogs_date();
+
+        $blog         = get_site( get_current_blog_id() );
+        $current_time = time();
+
+        // Compare the update time with the current time, allow delta < 2.
+        $this->assertEqualsWithDelta( $current_time, strtotime( $blog->last_updated ), 2, 'The dates should be equal' );
+    }
+
+    /**
+     * Test cached data for a site that does not exist and then again after it exists.
+     *
+     * @ticket 23405
+     */
+    public function test_get_blog_details_when_site_does_not_exist() {
+        // Create an unused site so that we can then assume an invalid site ID.
+        $blog_id = self::factory()->blog->create();
+        ++$blog_id;
+
+        // Prime the cache for an invalid site.
+        get_blog_details( $blog_id );
+
+        // When the cache is primed with an invalid site, the value is set to -1.
+        $this->assertSame( -1, wp_cache_get( $blog_id, 'blog-details' ) );
+
+        // Create a site in the invalid site's place.
+        self::factory()->blog->create();
+
+        // When a new site is created, its cache is cleared through refresh_blog_details.
+        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
+
+        $blog = get_blog_details( $blog_id );
+
+        // When the cache is refreshed, it should now equal the site data.
+        $this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
+    }
+
+    /**
+     * @ticket 26410
+     */
+    public function test_blog_details_cache_invalidation() {
+        update_option( 'blogname', 'foo' );
+        $details = get_site( get_current_blog_id() );
+        $this->assertSame( 'foo', $details->blogname );
+
+        update_option( 'blogname', 'bar' );
+        $details = get_site( get_current_blog_id() );
+        $this->assertSame( 'bar', $details->blogname );
+    }
+
+    /**
+     * Test the original and cached responses for a created and then deleted site when
+     * the blog ID is requested through get_blog_id_from_url().
+     */
+    public function test_get_blog_id_from_url() {
+        $blog_id = self::factory()->blog->create();
+        $details = get_site( $blog_id );
+        $key     = md5( $details->domain . $details->path );
+
+        // Test the original response and cached response for the newly created site.
+        $this->assertSame( $blog_id, get_blog_id_from_url( $details->domain, $details->path ) );
+        $this->assertSame( $blog_id, wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * Test the case insensitivity of the site lookup.
+     */
+    public function test_get_blog_id_from_url_is_case_insensitive() {
+        $blog_id = self::factory()->blog->create(
+            array(
+                'domain' => 'example.com',
+                'path'   => '/xyz',
+            )
+        );
+        $details = get_site( $blog_id );
+
+        $this->assertSame( $blog_id, get_blog_id_from_url( strtoupper( $details->domain ), strtoupper( $details->path ) ) );
+    }
+
+    /**
+     * Test the first and cached responses for a site that does not exist.
+     */
+    public function test_get_blog_id_from_url_that_does_not_exist() {
+        $blog_id = self::factory()->blog->create( array( 'path' => '/xyz' ) );
+        $details = get_site( $blog_id );
+
+        $this->assertSame( 0, get_blog_id_from_url( $details->domain, 'foo' ) );
+        $this->assertSame( -1, wp_cache_get( md5( $details->domain . 'foo' ), 'blog-id-cache' ) );
+    }
+
+    /**
+     * A blog ID is still available if only the `deleted` flag is set for a site. The same
+     * behavior would be expected if passing `false` explicitly to `wpmu_delete_blog()`.
+     */
+    public function test_get_blog_id_from_url_with_deleted_flag() {
+        $blog_id = self::factory()->blog->create();
+        $details = get_site( $blog_id );
+        $key     = md5( $details->domain . $details->path );
+        wpmu_delete_blog( $blog_id );
+
+        $this->assertSame( $blog_id, get_blog_id_from_url( $details->domain, $details->path ) );
+        $this->assertSame( $blog_id, wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * When deleted with the drop parameter as true, the cache will first be false, then set to
+     * -1 after an attempt at `get_blog_id_from_url()` is made.
+     */
+    public function test_get_blog_id_from_url_after_dropped() {
+        $blog_id = self::factory()->blog->create();
+        $details = get_site( $blog_id );
+        $key     = md5( $details->domain . $details->path );
+        wpmu_delete_blog( $blog_id, true );
+
+        $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+        $this->assertSame( 0, get_blog_id_from_url( $details->domain, $details->path ) );
+        $this->assertSame( -1, wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    /**
+     * Test with default parameter of site_id as null.
+     */
+    public function test_is_main_site() {
+        $this->assertTrue( is_main_site() );
+    }
+
+    /**
+     * Test with a site id of get_current_blog_id(), which should be the same as the
+     * default parameter tested above.
+     */
+    public function test_current_blog_id_is_main_site() {
+        $this->assertTrue( is_main_site( get_current_blog_id() ) );
+    }
+
+    /**
+     * Test with a site ID other than the main site to ensure a false response.
+     */
+    public function test_is_main_site_is_false_with_other_blog_id() {
+        $blog_id = self::factory()->blog->create();
+
+        $this->assertFalse( is_main_site( $blog_id ) );
+    }
+
+    /**
+     * Test with no passed ID after switching to another site ID.
+     */
+    public function test_is_main_site_is_false_after_switch_to_blog() {
+        $blog_id = self::factory()->blog->create();
+        switch_to_blog( $blog_id );
+
+        $this->assertFalse( is_main_site() );
+
+        restore_current_blog();
+    }
+
+    public function test_switch_upload_dir() {
+        $this->assertTrue( is_main_site() );
+
+        $site = get_current_site();
+        $date = date_format( date_create( 'now' ), 'Y/m' );
+
+        $info = wp_upload_dir();
+        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
+        $this->assertSame( '/' . $date, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
+
+        $blog_id = self::factory()->blog->create();
+
+        switch_to_blog( $blog_id );
+        $info = wp_upload_dir();
+        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['path'] );
+        $this->assertSame( '/' . $date, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
+        restore_current_blog();
+
+        $info = wp_upload_dir();
+        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
+        $this->assertSame( '/' . $date, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
+    }
+
+    /**
+     * Test the primary purpose of get_blog_post(), to retrieve a post from
+     * another site on the network.
+     */
+    public function test_get_blog_post_from_another_site_on_network() {
+        $blog_id = self::factory()->blog->create();
+        $post_id = self::factory()->post->create(); // Create a post on the primary site, ID 1.
+        $post    = get_post( $post_id );
+        switch_to_blog( $blog_id );
+
+        // The post created and retrieved on the main site should match the one retrieved "remotely".
+        $this->assertEquals( $post, get_blog_post( 1, $post_id ) );
+
+        restore_current_blog();
+    }
+
+    /**
+     * If get_blog_post() is used on the same site, it should still work.
+     */
+    public function test_get_blog_post_from_same_site() {
+        $post_id = self::factory()->post->create();
+
+        $this->assertEquals( get_blog_post( 1, $post_id ), get_post( $post_id ) );
+    }
+
+    /**
+     * A null response should be returned if an invalid post is requested.
+     */
+    public function test_get_blog_post_invalid_returns_null() {
+        $this->assertNull( get_blog_post( 1, 999999 ) );
+    }
+
+    /**
+     * Added as a callback to the domain_exists filter to provide manual results for
+     * the testing of the filter and for a test which does not need the database.
+     */
+    public function domain_exists_cb( $exists, $domain, $path, $site_id ) {
+        if ( 'foo' === $domain && 'bar/' === $path ) {
+            return 1234;
+        } else {
+            return null;
         }
-
-        /**
-         * When a site is flagged as 'deleted', its data should be cleared from cache.
-         */
-        public function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
-            $blog_id = self::factory()->blog->create();
-
-            $details = get_blog_details( $blog_id, false );
-            $key     = md5( $details->domain . $details->path );
-
-            // Delete the site without forcing a table drop.
-            wpmu_delete_blog( $blog_id, false );
-
-            $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    public function test_domain_exists_with_default_site_id() {
+        $details = get_site( 1 );
+
+        $this->assertSame( 1, domain_exists( $details->domain, $details->path ) );
+    }
+
+    public function test_domain_exists_with_specified_site_id() {
+        $details = get_site( 1 );
+
+        $this->assertSame( 1, domain_exists( $details->domain, $details->path, $details->site_id ) );
+    }
+
+    /**
+     * When the domain is valid, but the resulting site does not belong to the specified network,
+     * it is marked as not existing.
+     */
+    public function test_domain_does_not_exist_with_invalid_site_id() {
+        $details = get_site( 1 );
+
+        $this->assertNull( domain_exists( $details->domain, $details->path, 999 ) );
+    }
+
+    public function test_invalid_domain_does_not_exist_with_default_site_id() {
+        $this->assertNull( domain_exists( 'foo', 'bar' ) );
+    }
+
+    public function test_domain_filtered_to_exist() {
+        add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
+        $exists = domain_exists( 'foo', 'bar' );
+        remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
+        $this->assertSame( 1234, $exists );
+    }
+
+    /**
+     * When a path is passed to domain_exists, it is immediately trailing slashed. A path
+     * value with or without the slash should result in the same return value.
+     */
+    public function test_slashed_path_in_domain_exists() {
+        add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
+        $exists1 = domain_exists( 'foo', 'bar' );
+        $exists2 = domain_exists( 'foo', 'bar/' );
+        remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
+
+        // Make sure the same result is returned with or without a trailing slash.
+        $this->assertSame( $exists1, $exists2 );
+    }
+
+    /**
+     * Tests returning an address for a given valid ID.
+     */
+    public function test_get_blogaddress_by_id_with_valid_id() {
+        $blogaddress = get_blogaddress_by_id( 1 );
+        $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/', $blogaddress );
+    }
+
+    /**
+     * Tests returning an empty string for a non-existing ID.
+     */
+    public function test_get_blogaddress_by_id_with_invalid_id() {
+        $blogaddress = get_blogaddress_by_id( PHP_INT_MAX );
+        $this->assertSame( '', $blogaddress );
+    }
+
+    /**
+     * @ticket 14867
+     */
+    public function test_get_blogaddress_by_id_scheme_reflects_blog_scheme() {
+        $blog = self::factory()->blog->create();
+
+        $this->assertSame( 'http', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
+
+        update_blog_option( $blog, 'home', set_url_scheme( get_blog_option( $blog, 'home' ), 'https' ) );
+
+        $this->assertSame( 'https', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
+    }
+
+    /**
+     * @ticket 14867
+     */
+    public function test_get_blogaddress_by_id_scheme_is_unaffected_by_request() {
+        $blog = self::factory()->blog->create();
+
+        $this->assertFalse( is_ssl() );
+        $this->assertSame( 'http', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
+
+        $_SERVER['HTTPS'] = 'on';
+
+        $is_ssl  = is_ssl();
+        $address = parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME );
+
+        $this->assertTrue( $is_ssl );
+        $this->assertSame( 'http', $address );
+    }
+
+    /**
+     * @ticket 33620
+     * @dataProvider data_new_blog_url_schemes
+     */
+    public function test_new_blog_url_schemes( $home_scheme, $siteurl_scheme, $force_ssl_admin ) {
+        $current_site = get_current_site();
+
+        $home    = get_option( 'home' );
+        $siteurl = get_site_option( 'siteurl' );
+        $admin   = force_ssl_admin();
+
+        // Setup:
+        update_option( 'home', set_url_scheme( $home, $home_scheme ) );
+        update_site_option( 'siteurl', set_url_scheme( $siteurl, $siteurl_scheme ) );
+        force_ssl_admin( $force_ssl_admin );
+
+        // Install:
+        $new = wpmu_create_blog( $current_site->domain, '/new-blog/', 'New Blog', get_current_user_id() );
+
+        // Reset:
+        update_option( 'home', $home );
+        update_site_option( 'siteurl', $siteurl );
+        force_ssl_admin( $admin );
+
+        // Assert:
+        $this->assertNotWPError( $new );
+        $this->assertSame( $home_scheme, parse_url( get_blog_option( $new, 'home' ), PHP_URL_SCHEME ) );
+        $this->assertSame( $siteurl_scheme, parse_url( get_blog_option( $new, 'siteurl' ), PHP_URL_SCHEME ) );
+    }
+
+    public function data_new_blog_url_schemes() {
+        return array(
+            array(
+                'https',
+                'https',
+                false,
+            ),
+            array(
+                'http',
+                'https',
+                false,
+            ),
+            array(
+                'https',
+                'http',
+                false,
+            ),
+            array(
+                'http',
+                'http',
+                false,
+            ),
+            array(
+                'http',
+                'http',
+                true,
+            ),
+        );
+    }
+
+    /**
+     * @ticket 36918
+     */
+    public function test_new_blog_locale() {
+        $current_site = get_current_site();
+
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        update_site_option( 'WPLANG', 'de_DE' );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        // No locale, use default locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/de-de/', 'New Blog', get_current_user_id() );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( 'de_DE', get_blog_option( $blog_id, 'WPLANG' ) );
+
+        // Custom locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/es-es/', 'New Blog', get_current_user_id(), array( 'WPLANG' => 'es_ES' ) );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( 'es_ES', get_blog_option( $blog_id, 'WPLANG' ) );
+
+        // en_US locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/en-us/', 'New Blog', get_current_user_id(), array( 'WPLANG' => '' ) );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( '', get_blog_option( $blog_id, 'WPLANG' ) );
+    }
+
+    /**
+     * @ticket 40503
+     */
+    public function test_different_network_language() {
+        $network = get_network( self::$network_ids['make.wordpress.org/'] );
+
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+
+        update_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG', 'wibble' );
+        $blog_id = wpmu_create_blog( $network->domain, '/de-de/', 'New Blog', get_current_user_id(), array(), $network->id );
+
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertSame( get_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG' ), get_blog_option( $blog_id, 'WPLANG' ) );
+    }
+
+    /**
+     * Allows to set the WPLANG option to any language.
+     *
+     * @param string $value          The sanitized option value.
+     * @param string $option         The option name.
+     * @param string $original_value The original value passed to the function.
+     * @return string The original value.
+     */
+    public function filter_allow_unavailable_languages( $value, $option, $original_value ) {
+        return $original_value;
+    }
+
+    /**
+     * @ticket 29684
+     */
+    public function test_is_main_site_different_network() {
+        $this->assertTrue( is_main_site( self::$site_ids['make.wordpress.org/'], self::$network_ids['make.wordpress.org/'] ) );
+    }
+
+    /**
+     * @ticket 29684
+     */
+    public function test_is_main_site_different_network_random_site() {
+        $this->assertFalse( is_main_site( self::$site_ids['make.wordpress.org/foo/'], self::$network_ids['make.wordpress.org/'] ) );
+    }
+
+    /**
+     * @ticket 40201
+     * @dataProvider data_get_site_caches
+     */
+    public function test_clean_blog_cache( $key, $group ) {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        $replacements = array(
+            '%blog_id%'         => $site->blog_id,
+            '%domain%'          => $site->domain,
+            '%path%'            => $site->path,
+            '%domain_path_key%' => md5( $site->domain . $site->path ),
+        );
+
+        $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
+
+        if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
+            wp_cache_set( $key, (object) $site->to_array(), $group );
+        } else {
+            wp_cache_set( $key, 'something', $group );
         }
 
-        /**
-         * When a site is flagged as 'deleted', its data should remain in the database.
-         */
-        public function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
-            global $wpdb;
-
-            $blog_id = self::factory()->blog->create();
-
-            // Delete the site without forcing a table drop.
-            wpmu_delete_blog( $blog_id, false );
-
-            $prefix = $wpdb->get_blog_prefix( $blog_id );
-            foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                $suppress = $wpdb->suppress_errors();
-
-                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-
-                $wpdb->suppress_errors( $suppress );
-                $this->assertNotEmpty( $table_fields, $prefix . $table );
+        clean_blog_cache( $site );
+        $this->assertFalse( wp_cache_get( $key, $group ) );
+    }
+
+    /**
+     * @ticket 40201
+     * @dataProvider data_get_site_caches
+     */
+    public function test_clean_blog_cache_with_id( $key, $group ) {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        $replacements = array(
+            '%blog_id%'         => $site->blog_id,
+            '%domain%'          => $site->domain,
+            '%path%'            => $site->path,
+            '%domain_path_key%' => md5( $site->domain . $site->path ),
+        );
+
+        $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
+
+        if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
+            wp_cache_set( $key, (object) $site->to_array(), $group );
+        } else {
+            wp_cache_set( $key, 'something', $group );
+        }
+
+        clean_blog_cache( $site->blog_id );
+        $this->assertFalse( wp_cache_get( $key, $group ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_resets_last_changed() {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        wp_cache_delete( 'last_changed', 'sites' );
+
+        clean_blog_cache( $site );
+        $this->assertNotFalse( wp_cache_get( 'last_changed', 'sites' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_fires_action() {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        $old_count = did_action( 'clean_site_cache' );
+
+        clean_blog_cache( $site );
+        $this->assertSame( $old_count + 1, did_action( 'clean_site_cache' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_bails_on_suspend_cache_invalidation() {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        $old_count = did_action( 'clean_site_cache' );
+
+        $suspend = wp_suspend_cache_invalidation();
+        clean_blog_cache( $site );
+        wp_suspend_cache_invalidation( $suspend );
+        $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_bails_on_empty_input() {
+        $old_count = did_action( 'clean_site_cache' );
+
+        clean_blog_cache( null );
+        $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_bails_on_non_numeric_input() {
+        $old_count = did_action( 'clean_site_cache' );
+
+        clean_blog_cache( 'something' );
+        $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_clean_blog_cache_works_with_deleted_site() {
+        $site_id = 12345;
+
+        wp_cache_set( $site_id, 'something', 'site-details' );
+
+        clean_blog_cache( $site_id );
+        $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
+    }
+
+    /**
+     * @ticket 40201
+     * @dataProvider data_get_site_caches
+     */
+    public function test_refresh_blog_details( $key, $group ) {
+        $site = get_site( self::$site_ids['make.wordpress.org/'] );
+
+        $replacements = array(
+            '%blog_id%'         => $site->blog_id,
+            '%domain%'          => $site->domain,
+            '%path%'            => $site->path,
+            '%domain_path_key%' => md5( $site->domain . $site->path ),
+        );
+
+        $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
+
+        if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
+            wp_cache_set( $key, (object) $site->to_array(), $group );
+        } else {
+            wp_cache_set( $key, 'something', $group );
+        }
+
+        refresh_blog_details( $site->blog_id );
+        $this->assertFalse( wp_cache_get( $key, $group ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_refresh_blog_details_works_with_deleted_site() {
+        $site_id = 12345;
+
+        wp_cache_set( $site_id, 'something', 'site-details' );
+
+        refresh_blog_details( $site_id );
+        $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
+    }
+
+    /**
+     * @ticket 40201
+     */
+    public function test_refresh_blog_details_uses_current_site_as_default() {
+        $site_id = get_current_blog_id();
+
+        wp_cache_set( $site_id, 'something', 'site-details' );
+
+        refresh_blog_details();
+        $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
+    }
+
+    public function data_get_site_caches() {
+        return array(
+            array( '%blog_id%', 'sites' ),
+            array( '%blog_id%', 'site-details' ),
+            array( '%blog_id%', 'blog-details' ),
+            array( '%blog_id%' . 'short', 'blog-details' ),
+            array( '%domain_path_key%', 'blog-lookup' ),
+            array( '%domain_path_key%', 'blog-id-cache' ),
+        );
+    }
+
+    /**
+     * @ticket 40364
+     * @dataProvider data_wp_insert_site
+     */
+    public function test_wp_insert_site( $site_data, $expected_data ) {
+        remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+        $site_id = wp_insert_site( $site_data );
+
+        $this->assertIsInt( $site_id );
+
+        $site = get_site( $site_id );
+        foreach ( $expected_data as $key => $value ) {
+            $this->assertEquals( $value, $site->$key );
+        }
+    }
+
+    public function data_wp_insert_site() {
+        return array(
+            array(
+                array(
+                    'domain' => 'example.com',
+                ),
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/',
+                    'network_id' => 1,
+                    'public'     => 1,
+                    'archived'   => 0,
+                    'mature'     => 0,
+                    'spam'       => 0,
+                    'deleted'    => 0,
+                    'lang_id'    => 0,
+                ),
+            ),
+            array(
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/foo',
+                    'network_id' => 2,
+                ),
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/foo/',
+                    'network_id' => 2,
+                ),
+            ),
+            array(
+                array(
+                    'domain'  => 'example.com',
+                    'path'    => '/bar/',
+                    'site_id' => 2,
+                ),
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/bar/',
+                    'network_id' => 2,
+                ),
+            ),
+            array(
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/bar/',
+                    'site_id'    => 2,
+                    'network_id' => 3,
+                ),
+                array(
+                    'domain'     => 'example.com',
+                    'path'       => '/bar/',
+                    'network_id' => 3,
+                ),
+            ),
+            array(
+                array(
+                    'domain'   => 'example.com',
+                    'path'     => 'foobar',
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                    'lang_id'  => 1,
+                ),
+                array(
+                    'domain'   => 'example.com',
+                    'path'     => '/foobar/',
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                    'lang_id'  => 1,
+                ),
+            ),
+            array(
+                array(
+                    'domain' => 'example.com:8888',
+                ),
+                array(
+                    'domain'     => 'example.com:8888',
+                    'path'       => '/',
+                    'network_id' => 1,
+                    'public'     => 1,
+                    'archived'   => 0,
+                    'mature'     => 0,
+                    'spam'       => 0,
+                    'deleted'    => 0,
+                    'lang_id'    => 0,
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @ticket 50324
+     */
+    public function test_wp_insert_site_with_clean_site_cache() {
+        remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+
+        add_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
+
+        $site_id = wp_insert_site(
+            array(
+                'domain'     => 'valid-domain.com',
+                'path'       => '/valid-path/',
+                'network_id' => 1,
+            )
+        );
+
+        remove_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
+
+        $this->assertIsInt( $site_id );
+    }
+
+    public function action_database_insert_on_clean_site_cache() {
+        update_site_option( 'database_write_test.' . time(), true );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_insert_site_empty_domain() {
+        remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+        $site_id = wp_insert_site( array( 'public' => 0 ) );
+
+        $this->assertWPError( $site_id );
+        $this->assertSame( 'site_empty_domain', $site_id->get_error_code() );
+    }
+
+    /**
+     * @ticket 40364
+     * @dataProvider data_wp_update_site
+     */
+    public function test_wp_update_site( $site_data, $expected_data ) {
+        $site_id = self::factory()->blog->create();
+
+        $old_site = get_site( $site_id );
+
+        $result = wp_update_site( $site_id, $site_data );
+
+        $this->assertSame( $site_id, $result );
+
+        $new_site = get_site( $site_id );
+        foreach ( $new_site->to_array() as $key => $value ) {
+            if ( isset( $expected_data[ $key ] ) ) {
+                $this->assertEquals( $expected_data[ $key ], $value );
+            } elseif ( 'last_updated' === $key ) {
+                $this->assertLessThanOrEqual( $value, $old_site->last_updated );
+            } else {
+                $this->assertSame( $old_site->$key, $value );
             }
         }
-
-        /**
-         * When a site is fully deleted, its data should be cleared from cache.
-         */
-        public function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
-            $blog_id = self::factory()->blog->create();
-
-            $details = get_blog_details( $blog_id, false );
-            $key     = md5( $details->domain . $details->path );
-
-            // Delete the site and force a table drop.
-            wpmu_delete_blog( $blog_id, true );
-
-            $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    public function data_wp_update_site() {
+        return array(
+            array(
+                array(
+                    'domain'     => 'example.com',
+                    'network_id' => 2,
+                ),
+                array(
+                    'domain'  => 'example.com',
+                    'site_id' => 2,
+                ),
+            ),
+            array(
+                array(
+                    'path' => 'foo',
+                ),
+                array(
+                    'path' => '/foo/',
+                ),
+            ),
+            array(
+                array(
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                    'lang_id'  => 1,
+                ),
+                array(
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                    'lang_id'  => 1,
+                ),
+            ),
+            array(
+                array(
+                    'domain'     => 'example.com:8888',
+                    'network_id' => 2,
+                ),
+                array(
+                    'domain'  => 'example.com:8888',
+                    'site_id' => 2,
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_update_site_empty_domain() {
+        $site_id = self::factory()->blog->create();
+
+        $result = wp_update_site( $site_id, array( 'domain' => '' ) );
+
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_empty_domain', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_update_site_invalid_id() {
+        $result = wp_update_site( 444444, array( 'domain' => 'example.com' ) );
+
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_not_exist', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_update_site_cleans_cache() {
+        $site_id = self::factory()->blog->create();
+        $site1   = get_site( $site_id );
+
+        $result = wp_update_site( $site_id, array( 'public' => 0 ) );
+        $site2  = get_site( $site_id );
+
+        $result = wp_update_site( $site_id, array( 'public' => 1 ) );
+        $site3  = get_site( $site_id );
+
+        $this->assertSame( '1', $site1->public );
+        $this->assertSame( '0', $site2->public );
+        $this->assertSame( '1', $site3->public );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_delete_site() {
+        $site_id = self::factory()->blog->create();
+
+        $site = get_site( $site_id );
+
+        $result = wp_delete_site( $site_id );
+
+        $this->assertInstanceOf( 'WP_Site', $result );
+        $this->assertSame( $result->to_array(), $site->to_array() );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_delete_site_invalid_id() {
+        $result = wp_delete_site( 444444 );
+
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_not_exist', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_delete_site_validate_site_deletion_action() {
+        add_action( 'wp_validate_site_deletion', array( $this, 'action_wp_validate_site_deletion_prevent_deletion' ) );
+        $result = wp_delete_site( self::$site_ids['make.wordpress.org/'] );
+        $this->assertWPError( $result );
+        $this->assertSame( 'action_does_not_like_deletion', $result->get_error_code() );
+    }
+
+    public function action_wp_validate_site_deletion_prevent_deletion( $errors ) {
+        $errors->add( 'action_does_not_like_deletion', 'You cannot delete this site because the action does not like it.' );
+    }
+
+    /**
+     * @ticket 40364
+     * @dataProvider data_wp_normalize_site_data
+     */
+    public function test_wp_normalize_site_data( $data, $expected ) {
+        $result = wp_normalize_site_data( $data );
+
+        $this->assertSameSetsWithIndex( $expected, $result );
+    }
+
+    public function data_wp_normalize_site_data() {
+        return array(
+            array(
+                array(
+                    'network_id' => '4',
+                ),
+                array(
+                    'network_id' => 4,
+                ),
+            ),
+            array(
+                array(
+                    'domain' => 'invalid domain .com',
+                    'path'   => 'foo',
+                ),
+                array(
+                    'domain' => 'invaliddomain.com',
+                    'path'   => '/foo/',
+                ),
+            ),
+            array(
+                array(
+                    'domain' => '<yet>/another-invalid-domain.com',
+                ),
+                array(
+                    'domain' => 'yetanother-invalid-domain.com',
+                ),
+            ),
+            array(
+                array(
+                    'domain' => 'with-port.com:8888',
+                ),
+                array(
+                    'domain' => 'with-port.com:8888',
+                ),
+            ),
+            array(
+                array(
+                    'domain' => 'subdomain.with-port.com:8888',
+                ),
+                array(
+                    'domain' => 'subdomain.with-port.com:8888',
+                ),
+            ),
+            array(
+                array(
+                    'path' => '',
+                ),
+                array(
+                    'path' => '/',
+                ),
+            ),
+            array(
+                array(
+                    'public'   => '0',
+                    'archived' => '1',
+                    'mature'   => '1',
+                    'spam'     => true,
+                    'deleted'  => true,
+                ),
+                array(
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                ),
+            ),
+            array(
+                array(
+                    'registered'   => '',
+                    'last_updated' => '',
+                ),
+                array(),
+            ),
+            array(
+                array(
+                    'registered'   => '0000-00-00 00:00:00',
+                    'last_updated' => '0000-00-00 00:00:00',
+                ),
+                array(),
+            ),
+        );
+    }
+
+    /**
+     * @ticket 40364
+     * @dataProvider data_wp_validate_site_data
+     */
+    public function test_wp_validate_site_data( $data, $expected_errors ) {
+        $result = new WP_Error();
+        wp_validate_site_data( $result, $data );
+
+        if ( empty( $expected_errors ) ) {
+            $this->assertEmpty( $result->errors );
+        } else {
+            $this->assertSameSets( $expected_errors, array_keys( $result->errors ) );
         }
-
-        /**
-         * When a site is fully deleted, its data should be removed from the database.
-         */
-        public function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
-            global $wpdb;
-
-            $blog_id = self::factory()->blog->create();
-
-            // Delete the site and force a table drop.
-            wpmu_delete_blog( $blog_id, true );
-
-            $prefix = $wpdb->get_blog_prefix( $blog_id );
-            foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                $suppress = $wpdb->suppress_errors();
-
-                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-
-                $wpdb->suppress_errors( $suppress );
-                $this->assertEmpty( $table_fields );
-            }
+    }
+
+    public function data_wp_validate_site_data() {
+        $date = current_time( 'mysql', true );
+
+        return array(
+            array(
+                array(
+                    'domain'       => 'example-site.com',
+                    'path'         => '/',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => $date,
+                ),
+                array(),
+            ),
+            array(
+                array(
+                    'path'         => '/',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => $date,
+                ),
+                array( 'site_empty_domain' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'example-site.com',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => $date,
+                ),
+                array( 'site_empty_path' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'example-site.com',
+                    'path'         => '/',
+                    'registered'   => $date,
+                    'last_updated' => $date,
+                ),
+                array( 'site_empty_network_id' ),
+            ),
+            array(
+                array(
+                    'domain'       => get_site()->domain,
+                    'path'         => get_site()->path,
+                    'network_id'   => get_site()->network_id,
+                    'registered'   => $date,
+                    'last_updated' => $date,
+                ),
+                array( 'site_taken' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => '',
+                    'last_updated' => $date,
+                ),
+                array( 'site_empty_registered' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => '',
+                ),
+                array( 'site_empty_last_updated' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => '2000-13-32 25:25:61',
+                    'last_updated' => $date,
+                ),
+                array( 'site_invalid_registered' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => '2000-13-32 25:25:61',
+                ),
+                array( 'site_invalid_last_updated' ),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => '0000-00-00 00:00:00',
+                    'last_updated' => $date,
+                ),
+                array(),
+            ),
+            array(
+                array(
+                    'domain'       => 'valid-domain.com',
+                    'path'         => '/valid-path/',
+                    'network_id'   => 1,
+                    'registered'   => $date,
+                    'last_updated' => '0000-00-00 00:00:00',
+                ),
+                array(),
+            ),
+        );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_site_dates_are_gmt() {
+        $first_date = current_time( 'mysql', true );
+
+        remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+        $site_id = wp_insert_site(
+            array(
+                'domain'     => 'valid-domain.com',
+                'path'       => '/valid-path/',
+                'network_id' => 1,
+            )
+        );
+        $this->assertIsInt( $site_id );
+
+        $site = get_site( $site_id );
+        $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->last_updated ), 2, 'The dates should be equal' );
+
+        $second_date = current_time( 'mysql', true );
+        $site_id     = wp_update_site( $site_id, array() );
+        $this->assertIsInt( $site_id );
+
+        $site = get_site( $site_id );
+        $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( $second_date ), strtotime( $site->last_updated ), 2, 'The dates should be equal' );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_delete_site_cleans_cache() {
+        $site_id = self::factory()->blog->create();
+
+        get_site( $site_id );
+
+        wp_delete_site( $site_id );
+
+        $this->assertNull( get_site( $site_id ) );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_update_site_cleans_old_cache_on_domain_change() {
+        $old_domain = 'old.wordpress.org';
+        $new_domain = 'new.wordpress.org';
+
+        $site = self::factory()->blog->create_and_get(
+            array(
+                'domain' => $old_domain,
+                'path'   => '/',
+            )
+        );
+
+        // Populate the caches.
+        get_blog_details(
+            array(
+                'domain' => $old_domain,
+                'path'   => '/',
+            )
+        );
+        get_blog_id_from_url( $old_domain, '/' );
+        get_blog_details(
+            array(
+                'domain' => $new_domain,
+                'path'   => '/',
+            )
+        );
+        get_blog_id_from_url( $new_domain, '/' );
+
+        wp_update_site(
+            $site->id,
+            array(
+                'domain' => $new_domain,
+            )
+        );
+
+        $domain_path_key_old = md5( $old_domain . '/' );
+        $domain_path_key_new = md5( $new_domain . '/' );
+
+        // Ensure all respective cache values are empty.
+        $result = array(
+            wp_cache_get( $domain_path_key_old, 'blog-lookup' ),
+            wp_cache_get( $domain_path_key_old, 'blog-id-cache' ),
+            wp_cache_get( 'current_blog_' . $old_domain, 'site-options' ),
+            wp_cache_get( 'current_blog_' . $old_domain . '/', 'site-options' ),
+            wp_cache_get( $domain_path_key_new, 'blog-lookup' ),
+            wp_cache_get( $domain_path_key_new, 'blog-id-cache' ),
+            wp_cache_get( 'current_blog_' . $new_domain, 'site-options' ),
+            wp_cache_get( 'current_blog_' . $new_domain . '/', 'site-options' ),
+        );
+
+        $this->assertEmpty( array_filter( $result ) );
+    }
+
+    /**
+     * @ticket 40364
+     */
+    public function test_wp_update_site_cleans_old_cache_on_path_change() {
+        $old_path = '/foo/';
+        $new_path = '/bar/';
+
+        $site = self::factory()->blog->create_and_get(
+            array(
+                'domain' => 'test.wordpress.org',
+                'path'   => $old_path,
+            )
+        );
+
+        // Populate the caches.
+        get_blog_details(
+            array(
+                'domain' => 'test.wordpress.org',
+                'path'   => $old_path,
+            )
+        );
+        get_blog_id_from_url( 'test.wordpress.org', $old_path );
+        get_blog_details(
+            array(
+                'domain' => 'test.wordpress.org',
+                'path'   => $new_path,
+            )
+        );
+        get_blog_id_from_url( 'test.wordpress.org', $new_path );
+
+        wp_update_site(
+            $site->id,
+            array(
+                'path' => $new_path,
+            )
+        );
+
+        $domain_path_key_old = md5( 'test.wordpress.org' . $old_path );
+        $domain_path_key_new = md5( 'test.wordpress.org' . $new_path );
+
+        // Ensure all respective cache values are empty.
+        $result = array(
+            wp_cache_get( $domain_path_key_old, 'blog-lookup' ),
+            wp_cache_get( $domain_path_key_old, 'blog-id-cache' ),
+            wp_cache_get( 'current_blog_test.wordpress.org' . $old_path, 'site-options' ),
+            wp_cache_get( $domain_path_key_new, 'blog-lookup' ),
+            wp_cache_get( $domain_path_key_new, 'blog-id-cache' ),
+            wp_cache_get( 'current_blog_test.wordpress.org' . $new_path, 'site-options' ),
+        );
+
+        $this->assertEmpty( array_filter( $result ) );
+    }
+
+    /**
+     * @ticket 40364
+     * @dataProvider data_site_status_hook_triggers
+     */
+    public function test_site_status_hook_triggers( $insert_site_data, $expected_insert_hooks, $update_site_data, $expected_update_hooks ) {
+        // First: Insert a site.
+        $this->listen_to_site_status_hooks();
+
+        $site_data = array_merge(
+            array(
+                'domain' => 'example-site.com',
+                'path'   => '/',
+            ),
+            $insert_site_data
+        );
+
+        $site_id = wp_insert_site( $site_data );
+
+        $insert_expected = array_fill_keys( $expected_insert_hooks, $site_id );
+        $insert_result   = $this->get_listen_to_site_status_hooks_result();
+
+        // Second: Update that site.
+        $this->listen_to_site_status_hooks();
+
+        wp_update_site( $site_id, $update_site_data );
+
+        $update_expected = array_fill_keys( $expected_update_hooks, $site_id );
+        $update_result   = $this->get_listen_to_site_status_hooks_result();
+
+        // Check both insert and update results.
+        $this->assertSameSetsWithIndex( $insert_expected, $insert_result );
+        $this->assertSameSetsWithIndex( $update_expected, $update_result );
+    }
+
+    public function data_site_status_hook_triggers() {
+        return array(
+            array(
+                array(
+                    'public'   => 1,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                ),
+                array(
+                    'archive_blog',
+                    'mature_blog',
+                    'make_spam_blog',
+                    'make_delete_blog',
+                ),
+                array(
+                    'public'   => 0,
+                    'archived' => 0,
+                    'mature'   => 0,
+                    'spam'     => 0,
+                    'deleted'  => 0,
+                ),
+                array(
+                    'update_blog_public',
+                    'unarchive_blog',
+                    'unmature_blog',
+                    'make_ham_blog',
+                    'make_undelete_blog',
+                ),
+            ),
+            array(
+                array(
+                    'public'   => 0,
+                    'archived' => 0,
+                    'mature'   => 0,
+                    'spam'     => 0,
+                    'deleted'  => 0,
+                ),
+                array(
+                    'update_blog_public',
+                ),
+                array(
+                    'public'   => 1,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                ),
+                array(
+                    'update_blog_public',
+                    'archive_blog',
+                    'mature_blog',
+                    'make_spam_blog',
+                    'make_delete_blog',
+                ),
+            ),
+            array(
+                array(
+                    'public'   => 0,
+                    'archived' => 0,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 1,
+                ),
+                array(
+                    'update_blog_public',
+                    'mature_blog',
+                    'make_spam_blog',
+                    'make_delete_blog',
+                ),
+                array(
+                    'public'   => 0,
+                    'archived' => 1,
+                    'mature'   => 1,
+                    'spam'     => 1,
+                    'deleted'  => 0,
+                ),
+                array(
+                    'archive_blog',
+                    'make_undelete_blog',
+                ),
+            ),
+        );
+    }
+
+    private function listen_to_site_status_hooks() {
+        $this->site_status_hooks = array();
+
+        $hooknames = array(
+            'make_spam_blog',
+            'make_ham_blog',
+            'mature_blog',
+            'unmature_blog',
+            'archive_blog',
+            'unarchive_blog',
+            'make_delete_blog',
+            'make_undelete_blog',
+            'update_blog_public',
+        );
+
+        foreach ( $hooknames as $hookname ) {
+            add_action( $hookname, array( $this, 'action_site_status_hook' ), 10, 1 );
         }
-
-        /**
-         * When the main site of a network is fully deleted, its data should be cleared from cache.
-         */
-        public function test_data_in_cache_after_wpmu_delete_blog_main_site_drop_true() {
-            $blog_id = 1; // The main site in our test suite has an ID of 1.
-
-            $details = get_blog_details( $blog_id, false );
-            $key     = md5( $details->domain . $details->path );
-
-            // Delete the site and force a table drop.
-            wpmu_delete_blog( $blog_id, true );
-
-            $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-lookup' ) );
-            $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
+    }
+
+    private function get_listen_to_site_status_hooks_result() {
+        $hooknames = array(
+            'make_spam_blog',
+            'make_ham_blog',
+            'mature_blog',
+            'unmature_blog',
+            'archive_blog',
+            'unarchive_blog',
+            'make_delete_blog',
+            'make_undelete_blog',
+            'update_blog_public',
+        );
+
+        foreach ( $hooknames as $hookname ) {
+            remove_action( $hookname, array( $this, 'action_site_status_hook' ), 10 );
         }
 
-        /**
-         * When the main site of a network is fully deleted, its data should remain in the database.
-         */
-        public function test_data_in_tables_after_wpmu_delete_blog_main_site_drop_true() {
-            global $wpdb;
-
-            $blog_id = 1; // The main site in our test suite has an ID of 1.
-
-            // Delete the site and force a table drop.
-            wpmu_delete_blog( $blog_id, true );
-
-            $prefix = $wpdb->get_blog_prefix( $blog_id );
-            foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                $suppress = $wpdb->suppress_errors();
-
-                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-
-                $wpdb->suppress_errors( $suppress );
-                $this->assertNotEmpty( $table_fields, $prefix . $table );
-            }
+        return $this->site_status_hooks;
+    }
+
+    public function action_site_status_hook( $site_id ) {
+        $this->site_status_hooks[ current_action() ] = $site_id;
+    }
+
+    /**
+     * @ticket 41333
+     * @dataProvider data_wp_initialize_site
+     */
+    public function test_wp_initialize_site( $args, $expected_options, $expected_meta ) {
+        $result = wp_initialize_site( self::$uninitialized_site_id, $args );
+
+        switch_to_blog( self::$uninitialized_site_id );
+
+        $options = array();
+        foreach ( $expected_options as $option => $value ) {
+            $options[ $option ] = get_option( $option );
         }
 
-        /**
-         * The site count of a network should change when a site is flagged as 'deleted'.
-         */
-        public function test_network_count_after_wpmu_delete_blog_drop_false() {
-            $blog_id = self::factory()->blog->create();
-
-            // Delete the site without forcing a table drop.
-            wpmu_delete_blog( $blog_id, false );
-
-            // Update the blog count cache to use get_blog_count().
-            wp_update_network_counts();
-            $this->assertSame( 1, get_blog_count() );
+        $meta = array();
+        foreach ( $expected_meta as $meta_key => $value ) {
+            $meta[ $meta_key ] = get_site_meta( self::$uninitialized_site_id, $meta_key, true );
         }
 
-        /**
-         * The site count of a network should change when a site is fully deleted.
-         */
-        public function test_blog_count_after_wpmu_delete_blog_drop_true() {
-            $blog_id = self::factory()->blog->create();
-
-            // Delete the site and force a table drop.
-            wpmu_delete_blog( $blog_id, true );
-
-            // Update the blog count cache to use get_blog_count().
-            wp_update_network_counts();
-            $this->assertSame( 1, get_blog_count() );
-        }
-
-        /**
-         * When a site is deleted with wpmu_delete_blog(), only the files associated with
-         * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
-         * should change with upload directories.
-         */
-        public function test_upload_directories_after_multiple_wpmu_delete_blog() {
-            $filename = __FUNCTION__ . '.jpg';
-            $contents = __FUNCTION__ . '_contents';
-
-            // Upload a file to the main site on the network.
-            $file1 = wp_upload_bits( $filename, null, $contents );
-
-            $blog_id = self::factory()->blog->create();
-
-            switch_to_blog( $blog_id );
-            $file2 = wp_upload_bits( $filename, null, $contents );
-            restore_current_blog();
-
-            wpmu_delete_blog( $blog_id, true );
-
-            // The file on the main site should still exist. The file on the deleted site should not.
-            $this->assertFileExists( $file1['file'] );
-            $this->assertFileDoesNotExist( $file2['file'] );
-
-            wpmu_delete_blog( $blog_id, true );
-
-            // The file on the main site should still exist. The file on the deleted site should not.
-            $this->assertFileExists( $file1['file'] );
-            $this->assertFileDoesNotExist( $file2['file'] );
-
-            unlink( $file1['file'] );
-        }
-
-        public function test_wpmu_update_blogs_date() {
-            global $wpdb;
-
-            wpmu_update_blogs_date();
-
-            $blog         = get_site( get_current_blog_id() );
-            $current_time = time();
-
-            // Compare the update time with the current time, allow delta < 2.
-            $this->assertEqualsWithDelta( $current_time, strtotime( $blog->last_updated ), 2, 'The dates should be equal' );
-        }
-
-        /**
-         * Test cached data for a site that does not exist and then again after it exists.
-         *
-         * @ticket 23405
-         */
-        public function test_get_blog_details_when_site_does_not_exist() {
-            // Create an unused site so that we can then assume an invalid site ID.
-            $blog_id = self::factory()->blog->create();
-            ++$blog_id;
-
-            // Prime the cache for an invalid site.
-            get_blog_details( $blog_id );
-
-            // When the cache is primed with an invalid site, the value is set to -1.
-            $this->assertSame( -1, wp_cache_get( $blog_id, 'blog-details' ) );
-
-            // Create a site in the invalid site's place.
-            self::factory()->blog->create();
-
-            // When a new site is created, its cache is cleared through refresh_blog_details.
-            $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
-
-            $blog = get_blog_details( $blog_id );
-
-            // When the cache is refreshed, it should now equal the site data.
-            $this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
-        }
-
-        /**
-         * @ticket 26410
-         */
-        public function test_blog_details_cache_invalidation() {
-            update_option( 'blogname', 'foo' );
-            $details = get_site( get_current_blog_id() );
-            $this->assertSame( 'foo', $details->blogname );
-
-            update_option( 'blogname', 'bar' );
-            $details = get_site( get_current_blog_id() );
-            $this->assertSame( 'bar', $details->blogname );
-        }
-
-        /**
-         * Test the original and cached responses for a created and then deleted site when
-         * the blog ID is requested through get_blog_id_from_url().
-         */
-        public function test_get_blog_id_from_url() {
-            $blog_id = self::factory()->blog->create();
-            $details = get_site( $blog_id );
-            $key     = md5( $details->domain . $details->path );
-
-            // Test the original response and cached response for the newly created site.
-            $this->assertSame( $blog_id, get_blog_id_from_url( $details->domain, $details->path ) );
-            $this->assertSame( $blog_id, wp_cache_get( $key, 'blog-id-cache' ) );
-        }
-
-        /**
-         * Test the case insensitivity of the site lookup.
-         */
-        public function test_get_blog_id_from_url_is_case_insensitive() {
-            $blog_id = self::factory()->blog->create(
-                array(
-                    'domain' => 'example.com',
-                    'path'   => '/xyz',
-                )
-            );
-            $details = get_site( $blog_id );
-
-            $this->assertSame( $blog_id, get_blog_id_from_url( strtoupper( $details->domain ), strtoupper( $details->path ) ) );
-        }
-
-        /**
-         * Test the first and cached responses for a site that does not exist.
-         */
-        public function test_get_blog_id_from_url_that_does_not_exist() {
-            $blog_id = self::factory()->blog->create( array( 'path' => '/xyz' ) );
-            $details = get_site( $blog_id );
-
-            $this->assertSame( 0, get_blog_id_from_url( $details->domain, 'foo' ) );
-            $this->assertSame( -1, wp_cache_get( md5( $details->domain . 'foo' ), 'blog-id-cache' ) );
-        }
-
-        /**
-         * A blog ID is still available if only the `deleted` flag is set for a site. The same
-         * behavior would be expected if passing `false` explicitly to `wpmu_delete_blog()`.
-         */
-        public function test_get_blog_id_from_url_with_deleted_flag() {
-            $blog_id = self::factory()->blog->create();
-            $details = get_site( $blog_id );
-            $key     = md5( $details->domain . $details->path );
-            wpmu_delete_blog( $blog_id );
-
-            $this->assertSame( $blog_id, get_blog_id_from_url( $details->domain, $details->path ) );
-            $this->assertSame( $blog_id, wp_cache_get( $key, 'blog-id-cache' ) );
-        }
-
-        /**
-         * When deleted with the drop parameter as true, the cache will first be false, then set to
-         * -1 after an attempt at `get_blog_id_from_url()` is made.
-         */
-        public function test_get_blog_id_from_url_after_dropped() {
-            $blog_id = self::factory()->blog->create();
-            $details = get_site( $blog_id );
-            $key     = md5( $details->domain . $details->path );
-            wpmu_delete_blog( $blog_id, true );
-
-            $this->assertFalse( wp_cache_get( $key, 'blog-id-cache' ) );
-            $this->assertSame( 0, get_blog_id_from_url( $details->domain, $details->path ) );
-            $this->assertSame( -1, wp_cache_get( $key, 'blog-id-cache' ) );
-        }
-
-        /**
-         * Test with default parameter of site_id as null.
-         */
-        public function test_is_main_site() {
-            $this->assertTrue( is_main_site() );
-        }
-
-        /**
-         * Test with a site id of get_current_blog_id(), which should be the same as the
-         * default parameter tested above.
-         */
-        public function test_current_blog_id_is_main_site() {
-            $this->assertTrue( is_main_site( get_current_blog_id() ) );
-        }
-
-        /**
-         * Test with a site ID other than the main site to ensure a false response.
-         */
-        public function test_is_main_site_is_false_with_other_blog_id() {
-            $blog_id = self::factory()->blog->create();
-
-            $this->assertFalse( is_main_site( $blog_id ) );
-        }
-
-        /**
-         * Test with no passed ID after switching to another site ID.
-         */
-        public function test_is_main_site_is_false_after_switch_to_blog() {
-            $blog_id = self::factory()->blog->create();
-            switch_to_blog( $blog_id );
-
-            $this->assertFalse( is_main_site() );
-
-            restore_current_blog();
-        }
-
-        public function test_switch_upload_dir() {
-            $this->assertTrue( is_main_site() );
-
-            $site = get_current_site();
-            $date = date_format( date_create( 'now' ), 'Y/m' );
-
-            $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
-            $this->assertSame( '/' . $date, $info['subdir'] );
-            $this->assertFalse( $info['error'] );
-
-            $blog_id = self::factory()->blog->create();
-
-            switch_to_blog( $blog_id );
-            $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['path'] );
-            $this->assertSame( '/' . $date, $info['subdir'] );
-            $this->assertFalse( $info['error'] );
-            restore_current_blog();
-
-            $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
-            $this->assertSame( '/' . $date, $info['subdir'] );
-            $this->assertFalse( $info['error'] );
-        }
-
-        /**
-         * Test the primary purpose of get_blog_post(), to retrieve a post from
-         * another site on the network.
-         */
-        public function test_get_blog_post_from_another_site_on_network() {
-            $blog_id = self::factory()->blog->create();
-            $post_id = self::factory()->post->create(); // Create a post on the primary site, ID 1.
-            $post    = get_post( $post_id );
-            switch_to_blog( $blog_id );
-
-            // The post created and retrieved on the main site should match the one retrieved "remotely".
-            $this->assertEquals( $post, get_blog_post( 1, $post_id ) );
-
-            restore_current_blog();
-        }
-
-        /**
-         * If get_blog_post() is used on the same site, it should still work.
-         */
-        public function test_get_blog_post_from_same_site() {
-            $post_id = self::factory()->post->create();
-
-            $this->assertEquals( get_blog_post( 1, $post_id ), get_post( $post_id ) );
-        }
-
-        /**
-         * A null response should be returned if an invalid post is requested.
-         */
-        public function test_get_blog_post_invalid_returns_null() {
-            $this->assertNull( get_blog_post( 1, 999999 ) );
-        }
-
-        /**
-         * Added as a callback to the domain_exists filter to provide manual results for
-         * the testing of the filter and for a test which does not need the database.
-         */
-        public function domain_exists_cb( $exists, $domain, $path, $site_id ) {
-            if ( 'foo' === $domain && 'bar/' === $path ) {
-                return 1234;
-            } else {
-                return null;
-            }
-        }
-
-        public function test_domain_exists_with_default_site_id() {
-            $details = get_site( 1 );
-
-            $this->assertSame( 1, domain_exists( $details->domain, $details->path ) );
-        }
-
-        public function test_domain_exists_with_specified_site_id() {
-            $details = get_site( 1 );
-
-            $this->assertSame( 1, domain_exists( $details->domain, $details->path, $details->site_id ) );
-        }
-
-        /**
-         * When the domain is valid, but the resulting site does not belong to the specified network,
-         * it is marked as not existing.
-         */
-        public function test_domain_does_not_exist_with_invalid_site_id() {
-            $details = get_site( 1 );
-
-            $this->assertNull( domain_exists( $details->domain, $details->path, 999 ) );
-        }
-
-        public function test_invalid_domain_does_not_exist_with_default_site_id() {
-            $this->assertNull( domain_exists( 'foo', 'bar' ) );
-        }
-
-        public function test_domain_filtered_to_exist() {
-            add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
-            $exists = domain_exists( 'foo', 'bar' );
-            remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
-            $this->assertSame( 1234, $exists );
-        }
-
-        /**
-         * When a path is passed to domain_exists, it is immediately trailing slashed. A path
-         * value with or without the slash should result in the same return value.
-         */
-        public function test_slashed_path_in_domain_exists() {
-            add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
-            $exists1 = domain_exists( 'foo', 'bar' );
-            $exists2 = domain_exists( 'foo', 'bar/' );
-            remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
-
-            // Make sure the same result is returned with or without a trailing slash.
-            $this->assertSame( $exists1, $exists2 );
-        }
-
-        /**
-         * Tests returning an address for a given valid ID.
-         */
-        public function test_get_blogaddress_by_id_with_valid_id() {
-            $blogaddress = get_blogaddress_by_id( 1 );
-            $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/', $blogaddress );
-        }
-
-        /**
-         * Tests returning an empty string for a non-existing ID.
-         */
-        public function test_get_blogaddress_by_id_with_invalid_id() {
-            $blogaddress = get_blogaddress_by_id( PHP_INT_MAX );
-            $this->assertSame( '', $blogaddress );
-        }
-
-        /**
-         * @ticket 14867
-         */
-        public function test_get_blogaddress_by_id_scheme_reflects_blog_scheme() {
-            $blog = self::factory()->blog->create();
-
-            $this->assertSame( 'http', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
-
-            update_blog_option( $blog, 'home', set_url_scheme( get_blog_option( $blog, 'home' ), 'https' ) );
-
-            $this->assertSame( 'https', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
-        }
-
-        /**
-         * @ticket 14867
-         */
-        public function test_get_blogaddress_by_id_scheme_is_unaffected_by_request() {
-            $blog = self::factory()->blog->create();
-
-            $this->assertFalse( is_ssl() );
-            $this->assertSame( 'http', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
-
-            $_SERVER['HTTPS'] = 'on';
-
-            $is_ssl  = is_ssl();
-            $address = parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME );
-
-            $this->assertTrue( $is_ssl );
-            $this->assertSame( 'http', $address );
-        }
-
-        /**
-         * @ticket 33620
-         * @dataProvider data_new_blog_url_schemes
-         */
-        public function test_new_blog_url_schemes( $home_scheme, $siteurl_scheme, $force_ssl_admin ) {
-            $current_site = get_current_site();
-
-            $home    = get_option( 'home' );
-            $siteurl = get_site_option( 'siteurl' );
-            $admin   = force_ssl_admin();
-
-            // Setup:
-            update_option( 'home', set_url_scheme( $home, $home_scheme ) );
-            update_site_option( 'siteurl', set_url_scheme( $siteurl, $siteurl_scheme ) );
-            force_ssl_admin( $force_ssl_admin );
-
-            // Install:
-            $new = wpmu_create_blog( $current_site->domain, '/new-blog/', 'New Blog', get_current_user_id() );
-
-            // Reset:
-            update_option( 'home', $home );
-            update_site_option( 'siteurl', $siteurl );
-            force_ssl_admin( $admin );
-
-            // Assert:
-            $this->assertNotWPError( $new );
-            $this->assertSame( $home_scheme, parse_url( get_blog_option( $new, 'home' ), PHP_URL_SCHEME ) );
-            $this->assertSame( $siteurl_scheme, parse_url( get_blog_option( $new, 'siteurl' ), PHP_URL_SCHEME ) );
-        }
-
-        public function data_new_blog_url_schemes() {
-            return array(
-                array(
-                    'https',
-                    'https',
-                    false,
-                ),
-                array(
-                    'http',
-                    'https',
-                    false,
-                ),
-                array(
-                    'https',
-                    'http',
-                    false,
-                ),
-                array(
-                    'http',
-                    'http',
-                    false,
-                ),
-                array(
-                    'http',
-                    'http',
-                    true,
-                ),
-            );
-        }
-
-        /**
-         * @ticket 36918
-         */
-        public function test_new_blog_locale() {
-            $current_site = get_current_site();
-
-            add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
-            update_site_option( 'WPLANG', 'de_DE' );
-            remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
-
-            // No locale, use default locale.
-            add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
-            $blog_id = wpmu_create_blog( $current_site->domain, '/de-de/', 'New Blog', get_current_user_id() );
-            remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
-
-            $this->assertNotWPError( $blog_id );
-            $this->assertSame( 'de_DE', get_blog_option( $blog_id, 'WPLANG' ) );
-
-            // Custom locale.
-            add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
-            $blog_id = wpmu_create_blog( $current_site->domain, '/es-es/', 'New Blog', get_current_user_id(), array( 'WPLANG' => 'es_ES' ) );
-            remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
-
-            $this->assertNotWPError( $blog_id );
-            $this->assertSame( 'es_ES', get_blog_option( $blog_id, 'WPLANG' ) );
-
-            // en_US locale.
-            add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
-            $blog_id = wpmu_create_blog( $current_site->domain, '/en-us/', 'New Blog', get_current_user_id(), array( 'WPLANG' => '' ) );
-            remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
-
-            $this->assertNotWPError( $blog_id );
-            $this->assertSame( '', get_blog_option( $blog_id, 'WPLANG' ) );
-        }
-
-        /**
-         * @ticket 40503
-         */
-        public function test_different_network_language() {
-            $network = get_network( self::$network_ids['make.wordpress.org/'] );
-
-            add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
-
-            update_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG', 'wibble' );
-            $blog_id = wpmu_create_blog( $network->domain, '/de-de/', 'New Blog', get_current_user_id(), array(), $network->id );
-
-            remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
-
-            $this->assertSame( get_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG' ), get_blog_option( $blog_id, 'WPLANG' ) );
-        }
-
-        /**
-         * Allows to set the WPLANG option to any language.
-         *
-         * @param string $value          The sanitized option value.
-         * @param string $option         The option name.
-         * @param string $original_value The original value passed to the function.
-         * @return string The original value.
-         */
-        public function filter_allow_unavailable_languages( $value, $option, $original_value ) {
-            return $original_value;
-        }
-
-        /**
-         * @ticket 29684
-         */
-        public function test_is_main_site_different_network() {
-            $this->assertTrue( is_main_site( self::$site_ids['make.wordpress.org/'], self::$network_ids['make.wordpress.org/'] ) );
-        }
-
-        /**
-         * @ticket 29684
-         */
-        public function test_is_main_site_different_network_random_site() {
-            $this->assertFalse( is_main_site( self::$site_ids['make.wordpress.org/foo/'], self::$network_ids['make.wordpress.org/'] ) );
-        }
-
-        /**
-         * @ticket 40201
-         * @dataProvider data_get_site_caches
-         */
-        public function test_clean_blog_cache( $key, $group ) {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            $replacements = array(
-                '%blog_id%'         => $site->blog_id,
-                '%domain%'          => $site->domain,
-                '%path%'            => $site->path,
-                '%domain_path_key%' => md5( $site->domain . $site->path ),
-            );
-
-            $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
-
-            if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
-                wp_cache_set( $key, (object) $site->to_array(), $group );
-            } else {
-                wp_cache_set( $key, 'something', $group );
-            }
-
-            clean_blog_cache( $site );
-            $this->assertFalse( wp_cache_get( $key, $group ) );
-        }
-
-        /**
-         * @ticket 40201
-         * @dataProvider data_get_site_caches
-         */
-        public function test_clean_blog_cache_with_id( $key, $group ) {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            $replacements = array(
-                '%blog_id%'         => $site->blog_id,
-                '%domain%'          => $site->domain,
-                '%path%'            => $site->path,
-                '%domain_path_key%' => md5( $site->domain . $site->path ),
-            );
-
-            $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
-
-            if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
-                wp_cache_set( $key, (object) $site->to_array(), $group );
-            } else {
-                wp_cache_set( $key, 'something', $group );
-            }
-
-            clean_blog_cache( $site->blog_id );
-            $this->assertFalse( wp_cache_get( $key, $group ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_resets_last_changed() {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            wp_cache_delete( 'last_changed', 'sites' );
-
-            clean_blog_cache( $site );
-            $this->assertNotFalse( wp_cache_get( 'last_changed', 'sites' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_fires_action() {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            $old_count = did_action( 'clean_site_cache' );
-
-            clean_blog_cache( $site );
-            $this->assertSame( $old_count + 1, did_action( 'clean_site_cache' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_bails_on_suspend_cache_invalidation() {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            $old_count = did_action( 'clean_site_cache' );
-
-            $suspend = wp_suspend_cache_invalidation();
-            clean_blog_cache( $site );
-            wp_suspend_cache_invalidation( $suspend );
-            $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_bails_on_empty_input() {
-            $old_count = did_action( 'clean_site_cache' );
-
-            clean_blog_cache( null );
-            $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_bails_on_non_numeric_input() {
-            $old_count = did_action( 'clean_site_cache' );
-
-            clean_blog_cache( 'something' );
-            $this->assertSame( $old_count, did_action( 'clean_site_cache' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_clean_blog_cache_works_with_deleted_site() {
-            $site_id = 12345;
-
-            wp_cache_set( $site_id, 'something', 'site-details' );
-
-            clean_blog_cache( $site_id );
-            $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
-        }
-
-        /**
-         * @ticket 40201
-         * @dataProvider data_get_site_caches
-         */
-        public function test_refresh_blog_details( $key, $group ) {
-            $site = get_site( self::$site_ids['make.wordpress.org/'] );
-
-            $replacements = array(
-                '%blog_id%'         => $site->blog_id,
-                '%domain%'          => $site->domain,
-                '%path%'            => $site->path,
-                '%domain_path_key%' => md5( $site->domain . $site->path ),
-            );
-
-            $key = str_replace( array_keys( $replacements ), array_values( $replacements ), $key );
-
-            if ( 'sites' === $group ) { // This needs to be actual data for get_site() lookups.
-                wp_cache_set( $key, (object) $site->to_array(), $group );
-            } else {
-                wp_cache_set( $key, 'something', $group );
-            }
-
-            refresh_blog_details( $site->blog_id );
-            $this->assertFalse( wp_cache_get( $key, $group ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_refresh_blog_details_works_with_deleted_site() {
-            $site_id = 12345;
-
-            wp_cache_set( $site_id, 'something', 'site-details' );
-
-            refresh_blog_details( $site_id );
-            $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
-        }
-
-        /**
-         * @ticket 40201
-         */
-        public function test_refresh_blog_details_uses_current_site_as_default() {
-            $site_id = get_current_blog_id();
-
-            wp_cache_set( $site_id, 'something', 'site-details' );
-
-            refresh_blog_details();
-            $this->assertFalse( wp_cache_get( $site_id, 'site-details' ) );
-        }
-
-        public function data_get_site_caches() {
-            return array(
-                array( '%blog_id%', 'sites' ),
-                array( '%blog_id%', 'site-details' ),
-                array( '%blog_id%', 'blog-details' ),
-                array( '%blog_id%' . 'short', 'blog-details' ),
-                array( '%domain_path_key%', 'blog-lookup' ),
-                array( '%domain_path_key%', 'blog-id-cache' ),
-            );
-        }
-
-        /**
-         * @ticket 40364
-         * @dataProvider data_wp_insert_site
-         */
-        public function test_wp_insert_site( $site_data, $expected_data ) {
-            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-            $site_id = wp_insert_site( $site_data );
-
-            $this->assertIsInt( $site_id );
-
-            $site = get_site( $site_id );
-            foreach ( $expected_data as $key => $value ) {
-                $this->assertEquals( $value, $site->$key );
-            }
-        }
-
-        public function data_wp_insert_site() {
-            return array(
-                array(
-                    array(
-                        'domain' => 'example.com',
-                    ),
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/',
-                        'network_id' => 1,
-                        'public'     => 1,
-                        'archived'   => 0,
-                        'mature'     => 0,
-                        'spam'       => 0,
-                        'deleted'    => 0,
-                        'lang_id'    => 0,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/foo',
-                        'network_id' => 2,
-                    ),
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/foo/',
-                        'network_id' => 2,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain'  => 'example.com',
-                        'path'    => '/bar/',
-                        'site_id' => 2,
-                    ),
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/bar/',
-                        'network_id' => 2,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/bar/',
-                        'site_id'    => 2,
-                        'network_id' => 3,
-                    ),
-                    array(
-                        'domain'     => 'example.com',
-                        'path'       => '/bar/',
-                        'network_id' => 3,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain'   => 'example.com',
-                        'path'     => 'foobar',
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                        'lang_id'  => 1,
-                    ),
-                    array(
-                        'domain'   => 'example.com',
-                        'path'     => '/foobar/',
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                        'lang_id'  => 1,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain' => 'example.com:8888',
-                    ),
-                    array(
-                        'domain'     => 'example.com:8888',
-                        'path'       => '/',
-                        'network_id' => 1,
-                        'public'     => 1,
-                        'archived'   => 0,
-                        'mature'     => 0,
-                        'spam'       => 0,
-                        'deleted'    => 0,
-                        'lang_id'    => 0,
-                    ),
-                ),
-            );
-        }
-
-        /**
-         * @ticket 50324
-         */
-        public function test_wp_insert_site_with_clean_site_cache() {
-            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-
-            add_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
-
-            $site_id = wp_insert_site(
-                array(
-                    'domain'     => 'valid-domain.com',
-                    'path'       => '/valid-path/',
-                    'network_id' => 1,
-                )
-            );
-
-            remove_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
-
-            $this->assertIsInt( $site_id );
-        }
-
-        public function action_database_insert_on_clean_site_cache() {
-            update_site_option( 'database_write_test.' . time(), true );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_insert_site_empty_domain() {
-            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-            $site_id = wp_insert_site( array( 'public' => 0 ) );
-
-            $this->assertWPError( $site_id );
-            $this->assertSame( 'site_empty_domain', $site_id->get_error_code() );
-        }
-
-        /**
-         * @ticket 40364
-         * @dataProvider data_wp_update_site
-         */
-        public function test_wp_update_site( $site_data, $expected_data ) {
-            $site_id = self::factory()->blog->create();
-
-            $old_site = get_site( $site_id );
-
-            $result = wp_update_site( $site_id, $site_data );
-
-            $this->assertSame( $site_id, $result );
-
-            $new_site = get_site( $site_id );
-            foreach ( $new_site->to_array() as $key => $value ) {
-                if ( isset( $expected_data[ $key ] ) ) {
-                    $this->assertEquals( $expected_data[ $key ], $value );
-                } elseif ( 'last_updated' === $key ) {
-                    $this->assertLessThanOrEqual( $value, $old_site->last_updated );
-                } else {
-                    $this->assertSame( $old_site->$key, $value );
-                }
-            }
-        }
-
-        public function data_wp_update_site() {
-            return array(
-                array(
-                    array(
-                        'domain'     => 'example.com',
-                        'network_id' => 2,
-                    ),
-                    array(
-                        'domain'  => 'example.com',
-                        'site_id' => 2,
-                    ),
-                ),
-                array(
-                    array(
-                        'path' => 'foo',
-                    ),
-                    array(
-                        'path' => '/foo/',
-                    ),
-                ),
-                array(
-                    array(
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                        'lang_id'  => 1,
-                    ),
-                    array(
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                        'lang_id'  => 1,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain'     => 'example.com:8888',
-                        'network_id' => 2,
-                    ),
-                    array(
-                        'domain'  => 'example.com:8888',
-                        'site_id' => 2,
-                    ),
-                ),
-            );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_update_site_empty_domain() {
-            $site_id = self::factory()->blog->create();
-
-            $result = wp_update_site( $site_id, array( 'domain' => '' ) );
-
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_empty_domain', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_update_site_invalid_id() {
-            $result = wp_update_site( 444444, array( 'domain' => 'example.com' ) );
-
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_not_exist', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_update_site_cleans_cache() {
-            $site_id = self::factory()->blog->create();
-            $site1   = get_site( $site_id );
-
-            $result = wp_update_site( $site_id, array( 'public' => 0 ) );
-            $site2  = get_site( $site_id );
-
-            $result = wp_update_site( $site_id, array( 'public' => 1 ) );
-            $site3  = get_site( $site_id );
-
-            $this->assertSame( '1', $site1->public );
-            $this->assertSame( '0', $site2->public );
-            $this->assertSame( '1', $site3->public );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_delete_site() {
-            $site_id = self::factory()->blog->create();
-
-            $site = get_site( $site_id );
-
-            $result = wp_delete_site( $site_id );
-
-            $this->assertInstanceOf( 'WP_Site', $result );
-            $this->assertSame( $result->to_array(), $site->to_array() );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_delete_site_invalid_id() {
-            $result = wp_delete_site( 444444 );
-
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_not_exist', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_delete_site_validate_site_deletion_action() {
-            add_action( 'wp_validate_site_deletion', array( $this, 'action_wp_validate_site_deletion_prevent_deletion' ) );
-            $result = wp_delete_site( self::$site_ids['make.wordpress.org/'] );
-            $this->assertWPError( $result );
-            $this->assertSame( 'action_does_not_like_deletion', $result->get_error_code() );
-        }
-
-        public function action_wp_validate_site_deletion_prevent_deletion( $errors ) {
-            $errors->add( 'action_does_not_like_deletion', 'You cannot delete this site because the action does not like it.' );
-        }
-
-        /**
-         * @ticket 40364
-         * @dataProvider data_wp_normalize_site_data
-         */
-        public function test_wp_normalize_site_data( $data, $expected ) {
-            $result = wp_normalize_site_data( $data );
-
-            $this->assertSameSetsWithIndex( $expected, $result );
-        }
-
-        public function data_wp_normalize_site_data() {
-            return array(
-                array(
-                    array(
-                        'network_id' => '4',
-                    ),
-                    array(
-                        'network_id' => 4,
-                    ),
-                ),
-                array(
-                    array(
-                        'domain' => 'invalid domain .com',
-                        'path'   => 'foo',
-                    ),
-                    array(
-                        'domain' => 'invaliddomain.com',
-                        'path'   => '/foo/',
-                    ),
-                ),
-                array(
-                    array(
-                        'domain' => '<yet>/another-invalid-domain.com',
-                    ),
-                    array(
-                        'domain' => 'yetanother-invalid-domain.com',
-                    ),
-                ),
-                array(
-                    array(
-                        'domain' => 'with-port.com:8888',
-                    ),
-                    array(
-                        'domain' => 'with-port.com:8888',
-                    ),
-                ),
-                array(
-                    array(
-                        'domain' => 'subdomain.with-port.com:8888',
-                    ),
-                    array(
-                        'domain' => 'subdomain.with-port.com:8888',
-                    ),
-                ),
-                array(
-                    array(
-                        'path' => '',
-                    ),
-                    array(
-                        'path' => '/',
-                    ),
-                ),
-                array(
-                    array(
-                        'public'   => '0',
-                        'archived' => '1',
-                        'mature'   => '1',
-                        'spam'     => true,
-                        'deleted'  => true,
-                    ),
-                    array(
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                    ),
-                ),
-                array(
-                    array(
-                        'registered'   => '',
-                        'last_updated' => '',
-                    ),
-                    array(),
-                ),
-                array(
-                    array(
-                        'registered'   => '0000-00-00 00:00:00',
-                        'last_updated' => '0000-00-00 00:00:00',
-                    ),
-                    array(),
-                ),
-            );
-        }
-
-        /**
-         * @ticket 40364
-         * @dataProvider data_wp_validate_site_data
-         */
-        public function test_wp_validate_site_data( $data, $expected_errors ) {
-            $result = new WP_Error();
-            wp_validate_site_data( $result, $data );
-
-            if ( empty( $expected_errors ) ) {
-                $this->assertEmpty( $result->errors );
-            } else {
-                $this->assertSameSets( $expected_errors, array_keys( $result->errors ) );
-            }
-        }
-
-        public function data_wp_validate_site_data() {
-            $date = current_time( 'mysql', true );
-
-            return array(
-                array(
-                    array(
-                        'domain'       => 'example-site.com',
-                        'path'         => '/',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => $date,
-                    ),
-                    array(),
-                ),
-                array(
-                    array(
-                        'path'         => '/',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_empty_domain' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'example-site.com',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_empty_path' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'example-site.com',
-                        'path'         => '/',
-                        'registered'   => $date,
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_empty_network_id' ),
-                ),
-                array(
-                    array(
-                        'domain'       => get_site()->domain,
-                        'path'         => get_site()->path,
-                        'network_id'   => get_site()->network_id,
-                        'registered'   => $date,
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_taken' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => '',
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_empty_registered' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => '',
-                    ),
-                    array( 'site_empty_last_updated' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => '2000-13-32 25:25:61',
-                        'last_updated' => $date,
-                    ),
-                    array( 'site_invalid_registered' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => '2000-13-32 25:25:61',
-                    ),
-                    array( 'site_invalid_last_updated' ),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => '0000-00-00 00:00:00',
-                        'last_updated' => $date,
-                    ),
-                    array(),
-                ),
-                array(
-                    array(
-                        'domain'       => 'valid-domain.com',
-                        'path'         => '/valid-path/',
-                        'network_id'   => 1,
-                        'registered'   => $date,
-                        'last_updated' => '0000-00-00 00:00:00',
-                    ),
-                    array(),
-                ),
-            );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_site_dates_are_gmt() {
-            $first_date = current_time( 'mysql', true );
-
-            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-            $site_id = wp_insert_site(
-                array(
-                    'domain'     => 'valid-domain.com',
-                    'path'       => '/valid-path/',
-                    'network_id' => 1,
-                )
-            );
-            $this->assertIsInt( $site_id );
-
-            $site = get_site( $site_id );
-            $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
-            $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->last_updated ), 2, 'The dates should be equal' );
-
-            $second_date = current_time( 'mysql', true );
-            $site_id     = wp_update_site( $site_id, array() );
-            $this->assertIsInt( $site_id );
-
-            $site = get_site( $site_id );
-            $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
-            $this->assertEqualsWithDelta( strtotime( $second_date ), strtotime( $site->last_updated ), 2, 'The dates should be equal' );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_delete_site_cleans_cache() {
-            $site_id = self::factory()->blog->create();
-
-            get_site( $site_id );
-
-            wp_delete_site( $site_id );
-
-            $this->assertNull( get_site( $site_id ) );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_update_site_cleans_old_cache_on_domain_change() {
-            $old_domain = 'old.wordpress.org';
-            $new_domain = 'new.wordpress.org';
-
-            $site = self::factory()->blog->create_and_get(
-                array(
-                    'domain' => $old_domain,
-                    'path'   => '/',
-                )
-            );
-
-            // Populate the caches.
-            get_blog_details(
-                array(
-                    'domain' => $old_domain,
-                    'path'   => '/',
-                )
-            );
-            get_blog_id_from_url( $old_domain, '/' );
-            get_blog_details(
-                array(
-                    'domain' => $new_domain,
-                    'path'   => '/',
-                )
-            );
-            get_blog_id_from_url( $new_domain, '/' );
-
-            wp_update_site(
-                $site->id,
-                array(
-                    'domain' => $new_domain,
-                )
-            );
-
-            $domain_path_key_old = md5( $old_domain . '/' );
-            $domain_path_key_new = md5( $new_domain . '/' );
-
-            // Ensure all respective cache values are empty.
-            $result = array(
-                wp_cache_get( $domain_path_key_old, 'blog-lookup' ),
-                wp_cache_get( $domain_path_key_old, 'blog-id-cache' ),
-                wp_cache_get( 'current_blog_' . $old_domain, 'site-options' ),
-                wp_cache_get( 'current_blog_' . $old_domain . '/', 'site-options' ),
-                wp_cache_get( $domain_path_key_new, 'blog-lookup' ),
-                wp_cache_get( $domain_path_key_new, 'blog-id-cache' ),
-                wp_cache_get( 'current_blog_' . $new_domain, 'site-options' ),
-                wp_cache_get( 'current_blog_' . $new_domain . '/', 'site-options' ),
-            );
-
-            $this->assertEmpty( array_filter( $result ) );
-        }
-
-        /**
-         * @ticket 40364
-         */
-        public function test_wp_update_site_cleans_old_cache_on_path_change() {
-            $old_path = '/foo/';
-            $new_path = '/bar/';
-
-            $site = self::factory()->blog->create_and_get(
-                array(
-                    'domain' => 'test.wordpress.org',
-                    'path'   => $old_path,
-                )
-            );
-
-            // Populate the caches.
-            get_blog_details(
-                array(
-                    'domain' => 'test.wordpress.org',
-                    'path'   => $old_path,
-                )
-            );
-            get_blog_id_from_url( 'test.wordpress.org', $old_path );
-            get_blog_details(
-                array(
-                    'domain' => 'test.wordpress.org',
-                    'path'   => $new_path,
-                )
-            );
-            get_blog_id_from_url( 'test.wordpress.org', $new_path );
-
-            wp_update_site(
-                $site->id,
-                array(
-                    'path' => $new_path,
-                )
-            );
-
-            $domain_path_key_old = md5( 'test.wordpress.org' . $old_path );
-            $domain_path_key_new = md5( 'test.wordpress.org' . $new_path );
-
-            // Ensure all respective cache values are empty.
-            $result = array(
-                wp_cache_get( $domain_path_key_old, 'blog-lookup' ),
-                wp_cache_get( $domain_path_key_old, 'blog-id-cache' ),
-                wp_cache_get( 'current_blog_test.wordpress.org' . $old_path, 'site-options' ),
-                wp_cache_get( $domain_path_key_new, 'blog-lookup' ),
-                wp_cache_get( $domain_path_key_new, 'blog-id-cache' ),
-                wp_cache_get( 'current_blog_test.wordpress.org' . $new_path, 'site-options' ),
-            );
-
-            $this->assertEmpty( array_filter( $result ) );
-        }
-
-        /**
-         * @ticket 40364
-         * @dataProvider data_site_status_hook_triggers
-         */
-        public function test_site_status_hook_triggers( $insert_site_data, $expected_insert_hooks, $update_site_data, $expected_update_hooks ) {
-            // First: Insert a site.
-            $this->listen_to_site_status_hooks();
-
-            $site_data = array_merge(
-                array(
-                    'domain' => 'example-site.com',
-                    'path'   => '/',
-                ),
-                $insert_site_data
-            );
-
-            $site_id = wp_insert_site( $site_data );
-
-            $insert_expected = array_fill_keys( $expected_insert_hooks, $site_id );
-            $insert_result   = $this->get_listen_to_site_status_hooks_result();
-
-            // Second: Update that site.
-            $this->listen_to_site_status_hooks();
-
-            wp_update_site( $site_id, $update_site_data );
-
-            $update_expected = array_fill_keys( $expected_update_hooks, $site_id );
-            $update_result   = $this->get_listen_to_site_status_hooks_result();
-
-            // Check both insert and update results.
-            $this->assertSameSetsWithIndex( $insert_expected, $insert_result );
-            $this->assertSameSetsWithIndex( $update_expected, $update_result );
-        }
-
-        public function data_site_status_hook_triggers() {
-            return array(
-                array(
-                    array(
-                        'public'   => 1,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                    ),
-                    array(
-                        'archive_blog',
-                        'mature_blog',
-                        'make_spam_blog',
-                        'make_delete_blog',
-                    ),
-                    array(
-                        'public'   => 0,
-                        'archived' => 0,
-                        'mature'   => 0,
-                        'spam'     => 0,
-                        'deleted'  => 0,
-                    ),
-                    array(
-                        'update_blog_public',
-                        'unarchive_blog',
-                        'unmature_blog',
-                        'make_ham_blog',
-                        'make_undelete_blog',
-                    ),
-                ),
-                array(
-                    array(
-                        'public'   => 0,
-                        'archived' => 0,
-                        'mature'   => 0,
-                        'spam'     => 0,
-                        'deleted'  => 0,
-                    ),
-                    array(
-                        'update_blog_public',
-                    ),
-                    array(
-                        'public'   => 1,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                    ),
-                    array(
-                        'update_blog_public',
-                        'archive_blog',
-                        'mature_blog',
-                        'make_spam_blog',
-                        'make_delete_blog',
-                    ),
-                ),
-                array(
-                    array(
-                        'public'   => 0,
-                        'archived' => 0,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 1,
-                    ),
-                    array(
-                        'update_blog_public',
-                        'mature_blog',
-                        'make_spam_blog',
-                        'make_delete_blog',
-                    ),
-                    array(
-                        'public'   => 0,
-                        'archived' => 1,
-                        'mature'   => 1,
-                        'spam'     => 1,
-                        'deleted'  => 0,
-                    ),
-                    array(
-                        'archive_blog',
-                        'make_undelete_blog',
-                    ),
-                ),
-            );
-        }
-
-        private function listen_to_site_status_hooks() {
-            $this->site_status_hooks = array();
-
-            $hooknames = array(
-                'make_spam_blog',
-                'make_ham_blog',
-                'mature_blog',
-                'unmature_blog',
-                'archive_blog',
-                'unarchive_blog',
-                'make_delete_blog',
-                'make_undelete_blog',
-                'update_blog_public',
-            );
-
-            foreach ( $hooknames as $hookname ) {
-                add_action( $hookname, array( $this, 'action_site_status_hook' ), 10, 1 );
-            }
-        }
-
-        private function get_listen_to_site_status_hooks_result() {
-            $hooknames = array(
-                'make_spam_blog',
-                'make_ham_blog',
-                'mature_blog',
-                'unmature_blog',
-                'archive_blog',
-                'unarchive_blog',
-                'make_delete_blog',
-                'make_undelete_blog',
-                'update_blog_public',
-            );
-
-            foreach ( $hooknames as $hookname ) {
-                remove_action( $hookname, array( $this, 'action_site_status_hook' ), 10 );
-            }
-
-            return $this->site_status_hooks;
-        }
-
-        public function action_site_status_hook( $site_id ) {
-            $this->site_status_hooks[ current_action() ] = $site_id;
-        }
-
-        /**
-         * @ticket 41333
-         * @dataProvider data_wp_initialize_site
-         */
-        public function test_wp_initialize_site( $args, $expected_options, $expected_meta ) {
-            $result = wp_initialize_site( self::$uninitialized_site_id, $args );
-
-            switch_to_blog( self::$uninitialized_site_id );
-
-            $options = array();
-            foreach ( $expected_options as $option => $value ) {
-                $options[ $option ] = get_option( $option );
-            }
-
-            $meta = array();
-            foreach ( $expected_meta as $meta_key => $value ) {
-                $meta[ $meta_key ] = get_site_meta( self::$uninitialized_site_id, $meta_key, true );
-            }
-
-            restore_current_blog();
-
-            $initialized = wp_is_site_initialized( self::$uninitialized_site_id );
-
-            wp_uninitialize_site( self::$uninitialized_site_id );
-
-            $this->assertTrue( $result );
-            $this->assertTrue( $initialized );
-            $this->assertSame( $expected_options, $options );
-            $this->assertSame( $expected_meta, $meta );
-        }
-
-        public function data_wp_initialize_site() {
-            return array(
-                array(
-                    array(),
-                    array(
-                        'home'        => 'http://uninitialized.org',
-                        'siteurl'     => 'http://uninitialized.org',
-                        'admin_email' => '',
-                        'blog_public' => '1',
-                    ),
-                    array(),
-                ),
-                array(
-                    array(
-                        'options' => array(
-                            'home'    => 'https://uninitialized.org',
-                            'siteurl' => 'https://uninitialized.org',
-                            'key'     => 'value',
-                        ),
-                        'meta'    => array(
-                            'key1' => 'value1',
-                            'key2' => 'value2',
-                        ),
-                    ),
-                    array(
+        restore_current_blog();
+
+        $initialized = wp_is_site_initialized( self::$uninitialized_site_id );
+
+        wp_uninitialize_site( self::$uninitialized_site_id );
+
+        $this->assertTrue( $result );
+        $this->assertTrue( $initialized );
+        $this->assertSame( $expected_options, $options );
+        $this->assertSame( $expected_meta, $meta );
+    }
+
+    public function data_wp_initialize_site() {
+        return array(
+            array(
+                array(),
+                array(
+                    'home'        => 'http://uninitialized.org',
+                    'siteurl'     => 'http://uninitialized.org',
+                    'admin_email' => '',
+                    'blog_public' => '1',
+                ),
+                array(),
+            ),
+            array(
+                array(
+                    'options' => array(
                         'home'    => 'https://uninitialized.org',
                         'siteurl' => 'https://uninitialized.org',
                         'key'     => 'value',
                     ),
-                    array(
+                    'meta'    => array(
                         'key1' => 'value1',
                         'key2' => 'value2',
-                        'key3' => '',
                     ),
                 ),
                 array(
-                    array(
-                        'title'   => 'My New Site',
-                        'options' => array(
-                            'blogdescription' => 'Just My New Site',
-                        ),
-                    ),
-                    array(
-                        'blogname'        => 'My New Site',
+                    'home'    => 'https://uninitialized.org',
+                    'siteurl' => 'https://uninitialized.org',
+                    'key'     => 'value',
+                ),
+                array(
+                    'key1' => 'value1',
+                    'key2' => 'value2',
+                    'key3' => '',
+                ),
+            ),
+            array(
+                array(
+                    'title'   => 'My New Site',
+                    'options' => array(
                         'blogdescription' => 'Just My New Site',
                     ),
-                    array(),
-                ),
-            );
-        }
-
-        /**
-         * @ticket 41333
+                ),
+                array(
+                    'blogname'        => 'My New Site',
+                    'blogdescription' => 'Just My New Site',
+                ),
+                array(),
+            ),
+        );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_user_roles() {
+        global $wpdb;
+
+        $result = wp_initialize_site( self::$uninitialized_site_id, array() );
+
+        switch_to_blog( self::$uninitialized_site_id );
+        $table_prefix = $wpdb->get_blog_prefix( self::$uninitialized_site_id );
+        $roles        = get_option( $table_prefix . 'user_roles' );
+        restore_current_blog();
+
+        wp_uninitialize_site( self::$uninitialized_site_id );
+
+        $this->assertTrue( $result );
+        $this->assertSameSets(
+            array(
+                'administrator',
+                'editor',
+                'author',
+                'contributor',
+                'subscriber',
+            ),
+            array_keys( $roles )
+        );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_user_is_admin() {
+        $result = wp_initialize_site( self::$uninitialized_site_id, array( 'user_id' => 1 ) );
+
+        switch_to_blog( self::$uninitialized_site_id );
+        $user_is_admin = user_can( 1, 'manage_options' );
+        $admin_email   = get_option( 'admin_email' );
+        restore_current_blog();
+
+        wp_uninitialize_site( self::$uninitialized_site_id );
+
+        $this->assertTrue( $result );
+        $this->assertTrue( $user_is_admin );
+        $this->assertSame( get_userdata( 1 )->user_email, $admin_email );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_args_filter() {
+        add_filter( 'wp_initialize_site_args', array( $this, 'filter_wp_initialize_site_args' ), 10, 3 );
+        $result = wp_initialize_site( self::$uninitialized_site_id, array( 'title' => 'My Site' ) );
+
+        switch_to_blog( self::$uninitialized_site_id );
+        $site_title = get_option( 'blogname' );
+        restore_current_blog();
+
+        wp_uninitialize_site( self::$uninitialized_site_id );
+
+        $this->assertSame(
+            sprintf( 'My Site %1$d in Network %2$d', self::$uninitialized_site_id, get_site( self::$uninitialized_site_id )->network_id ),
+            $site_title
+        );
+    }
+
+    public function filter_wp_initialize_site_args( $args, $site, $network ) {
+        $args['title'] = sprintf( 'My Site %1$d in Network %2$d', $site->id, $network->id );
+
+        return $args;
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_empty_id() {
+        $result = wp_initialize_site( 0 );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_empty_id', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_invalid_id() {
+        $result = wp_initialize_site( 123 );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_invalid_id', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_initialize_site_already_initialized() {
+        $result = wp_initialize_site( get_current_blog_id() );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_already_initialized', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_uninitialize_site() {
+        $site_id = self::factory()->blog->create();
+
+        $result = wp_uninitialize_site( $site_id );
+        $this->assertTrue( $result );
+        $this->assertFalse( wp_is_site_initialized( $site_id ) );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_uninitialize_site_empty_id() {
+        $result = wp_uninitialize_site( 0 );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_empty_id', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_uninitialize_site_invalid_id() {
+        $result = wp_uninitialize_site( 123 );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_invalid_id', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_uninitialize_site_already_uninitialized() {
+        $result = wp_uninitialize_site( self::$uninitialized_site_id );
+        $this->assertWPError( $result );
+        $this->assertSame( 'site_already_uninitialized', $result->get_error_code() );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_is_site_initialized() {
+        $this->assertTrue( wp_is_site_initialized( get_current_blog_id() ) );
+        $this->assertFalse( wp_is_site_initialized( self::$uninitialized_site_id ) );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_is_site_initialized_prefilter() {
+        add_filter( 'pre_wp_is_site_initialized', '__return_false' );
+        $this->assertFalse( wp_is_site_initialized( get_current_blog_id() ) );
+
+        add_filter( 'pre_wp_is_site_initialized', '__return_true' );
+        $this->assertTrue( wp_is_site_initialized( self::$uninitialized_site_id ) );
+    }
+
+    /**
+     * @ticket 41333
+     */
+    public function test_wp_insert_site_forwards_args_to_wp_initialize_site() {
+        $args = array(
+            'user_id' => 1,
+            'title'   => 'My Site',
+            'options' => array( 'option1' => 'value1' ),
+            'meta'    => array( 'meta1' => 'value1' ),
+        );
+
+        add_filter( 'wp_initialize_site_args', array( $this, 'filter_wp_initialize_site_args_catch_args' ) );
+        $site_id = wp_insert_site(
+            array_merge(
+                array(
+                    'domain' => 'testsite.org',
+                    'path'   => '/',
+                ),
+                $args
+            )
+        );
+
+        $passed_args                   = $this->wp_initialize_site_args;
+        $this->wp_initialize_site_args = null;
+
+        $this->assertSameSetsWithIndex( $args, $passed_args );
+    }
+
+    public function filter_wp_initialize_site_args_catch_args( $args ) {
+        $this->wp_initialize_site_args = $args;
+
+        return $args;
+    }
+
+    /**
+     * @ticket 46125
+     */
+    public function test_wpmu_create_blog_cache_cleanup_backward_compatible() {
+        add_action( 'populate_options', array( $this, 'populate_options_callback' ) );
+
+        $blog_id = wpmu_create_blog( 'testsite1.example.org', '/test', 'test', 1, array( 'public' => 1 ), 2 );
+
+        /*
+         * Should not hit blog_details cache initialized in $this->populate_options_callback triggered during
+         * populate_options callback's call of get_blog_details.
          */
-        public function test_wp_initialize_site_user_roles() {
-            global $wpdb;
-
-            $result = wp_initialize_site( self::$uninitialized_site_id, array() );
-
-            switch_to_blog( self::$uninitialized_site_id );
-            $table_prefix = $wpdb->get_blog_prefix( self::$uninitialized_site_id );
-            $roles        = get_option( $table_prefix . 'user_roles' );
-            restore_current_blog();
-
-            wp_uninitialize_site( self::$uninitialized_site_id );
-
-            $this->assertTrue( $result );
-            $this->assertSameSets(
-                array(
-                    'administrator',
-                    'editor',
-                    'author',
-                    'contributor',
-                    'subscriber',
-                ),
-                array_keys( $roles )
-            );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_initialize_site_user_is_admin() {
-            $result = wp_initialize_site( self::$uninitialized_site_id, array( 'user_id' => 1 ) );
-
-            switch_to_blog( self::$uninitialized_site_id );
-            $user_is_admin = user_can( 1, 'manage_options' );
-            $admin_email   = get_option( 'admin_email' );
-            restore_current_blog();
-
-            wp_uninitialize_site( self::$uninitialized_site_id );
-
-            $this->assertTrue( $result );
-            $this->assertTrue( $user_is_admin );
-            $this->assertSame( get_userdata( 1 )->user_email, $admin_email );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_initialize_site_args_filter() {
-            add_filter( 'wp_initialize_site_args', array( $this, 'filter_wp_initialize_site_args' ), 10, 3 );
-            $result = wp_initialize_site( self::$uninitialized_site_id, array( 'title' => 'My Site' ) );
-
-            switch_to_blog( self::$uninitialized_site_id );
-            $site_title = get_option( 'blogname' );
-            restore_current_blog();
-
-            wp_uninitialize_site( self::$uninitialized_site_id );
-
-            $this->assertSame(
-                sprintf( 'My Site %1$d in Network %2$d', self::$uninitialized_site_id, get_site( self::$uninitialized_site_id )->network_id ),
-                $site_title
-            );
-        }
-
-        public function filter_wp_initialize_site_args( $args, $site, $network ) {
-            $args['title'] = sprintf( 'My Site %1$d in Network %2$d', $site->id, $network->id );
-
-            return $args;
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_initialize_site_empty_id() {
-            $result = wp_initialize_site( 0 );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_empty_id', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_initialize_site_invalid_id() {
-            $result = wp_initialize_site( 123 );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_invalid_id', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_initialize_site_already_initialized() {
-            $result = wp_initialize_site( get_current_blog_id() );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_already_initialized', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_uninitialize_site() {
-            $site_id = self::factory()->blog->create();
-
-            $result = wp_uninitialize_site( $site_id );
-            $this->assertTrue( $result );
-            $this->assertFalse( wp_is_site_initialized( $site_id ) );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_uninitialize_site_empty_id() {
-            $result = wp_uninitialize_site( 0 );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_empty_id', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_uninitialize_site_invalid_id() {
-            $result = wp_uninitialize_site( 123 );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_invalid_id', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_uninitialize_site_already_uninitialized() {
-            $result = wp_uninitialize_site( self::$uninitialized_site_id );
-            $this->assertWPError( $result );
-            $this->assertSame( 'site_already_uninitialized', $result->get_error_code() );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_is_site_initialized() {
-            $this->assertTrue( wp_is_site_initialized( get_current_blog_id() ) );
-            $this->assertFalse( wp_is_site_initialized( self::$uninitialized_site_id ) );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_is_site_initialized_prefilter() {
-            add_filter( 'pre_wp_is_site_initialized', '__return_false' );
-            $this->assertFalse( wp_is_site_initialized( get_current_blog_id() ) );
-
-            add_filter( 'pre_wp_is_site_initialized', '__return_true' );
-            $this->assertTrue( wp_is_site_initialized( self::$uninitialized_site_id ) );
-        }
-
-        /**
-         * @ticket 41333
-         */
-        public function test_wp_insert_site_forwards_args_to_wp_initialize_site() {
-            $args = array(
-                'user_id' => 1,
-                'title'   => 'My Site',
-                'options' => array( 'option1' => 'value1' ),
-                'meta'    => array( 'meta1' => 'value1' ),
-            );
-
-            add_filter( 'wp_initialize_site_args', array( $this, 'filter_wp_initialize_site_args_catch_args' ) );
-            $site_id = wp_insert_site(
-                array_merge(
-                    array(
-                        'domain' => 'testsite.org',
-                        'path'   => '/',
-                    ),
-                    $args
-                )
-            );
-
-            $passed_args                   = $this->wp_initialize_site_args;
-            $this->wp_initialize_site_args = null;
-
-            $this->assertSameSetsWithIndex( $args, $passed_args );
-        }
-
-        public function filter_wp_initialize_site_args_catch_args( $args ) {
-            $this->wp_initialize_site_args = $args;
-
-            return $args;
-        }
-
-        /**
-         * @ticket 46125
-         */
-        public function test_wpmu_create_blog_cache_cleanup_backward_compatible() {
-            add_action( 'populate_options', array( $this, 'populate_options_callback' ) );
-
-            $blog_id = wpmu_create_blog( 'testsite1.example.org', '/test', 'test', 1, array( 'public' => 1 ), 2 );
-
-            /*
-             * Should not hit blog_details cache initialized in $this->populate_options_callback triggered during
-             * populate_options callback's call of get_blog_details.
-             */
-            $this->assertSame( 'http://testsite1.example.org/test', get_blog_details( $blog_id )->siteurl );
-            $this->assertSame( 'http://testsite1.example.org/test', get_site( $blog_id )->siteurl );
-
-            remove_action( 'populate_options', array( $this, 'populate_options_callback' ) );
-        }
-
-        /**
-         * Populate options callback to warm cache for blog-details / site-details cache group
-         */
-        public function populate_options_callback() {
-            // Cache blog details.
-            $blog_id = get_current_blog_id();
-            get_blog_details( $blog_id );
-            get_site( $blog_id )->siteurl;
-            // Set siteurl.
-            update_option( 'siteurl', 'http://testsite1.example.org/test' );
-        }
-
-        /**
-         * Tests whether all expected meta are provided in deprecated `wpmu_new_blog` action.
-         *
-         * @dataProvider data_wpmu_new_blog_action_backward_compatible
-         *
-         * @ticket 46351
-         */
-        public function test_wpmu_new_blog_action_backward_compatible( $meta, $expected_meta ) {
-            // We are testing deprecated hook. Register it to expected deprecated notices.
-            $this->setExpectedDeprecated( 'wpmu_new_blog' );
-            add_action( 'wpmu_new_blog', array( $this, 'wpmu_new_blog_callback' ), 10, 6 );
-
-            wpmu_create_blog( 'testsite1.example.org', '/new-blog/', 'New Blog', get_current_user_id(), $meta, 1 );
-
-            $this->assertSameSetsWithIndex( $expected_meta, $this->wp_initialize_site_meta );
-
-            $this->wp_initialize_site_meta = array();
-        }
-
-        /**
-         * @ticket 42251
-         */
-        public function test_get_site_not_found_cache() {
-            $new_site_id = $this->_get_next_site_id();
-            $this->assertNull( get_site( $new_site_id ) );
-
-            $num_queries = get_num_queries();
-            $this->assertNull( get_site( $new_site_id ) );
-            $this->assertSame( $num_queries, get_num_queries() );
-        }
-
-        /**
-         * @ticket 42251
-         */
-        public function test_get_site_not_found_cache_clear() {
-            $new_site_id = $this->_get_next_site_id();
-            $this->assertNull( get_site( $new_site_id ) );
-
-            $new_site = self::factory()->blog->create_and_get();
-
-            // Double-check we got the ID of the new site correct.
-            $this->assertEquals( $new_site_id, $new_site->blog_id );
-
-            // Verify that if we fetch the site now, it's no longer false.
-            $fetched_site = get_site( $new_site_id );
-            $this->assertInstanceOf( 'WP_Site', $fetched_site );
-            $this->assertEquals( $new_site_id, $fetched_site->blog_id );
-        }
-
-        /**
-         * Gets the ID of the next site that will get inserted
-         * @return int
-         */
-        protected function _get_next_site_id() {
-            global $wpdb;
-            // Create an entry.
-            static::factory()->blog->create();
-            // Get the ID after it.
-            return (int) $wpdb->get_var( 'SELECT blog_id FROM ' . $wpdb->blogs . ' ORDER BY blog_ID DESC LIMIT 1' ) + 1;
-        }
-
-        /**
-         * Capture the $meta value passed to the wpmu_new_blog action and compare it.
-         */
-        public function wpmu_new_blog_callback( $blog_id, $user_id, $domain, $path, $network_id, $meta ) {
-            $this->wp_initialize_site_meta = $meta;
-        }
-
-        public function data_wpmu_new_blog_action_backward_compatible() {
-            return array(
-                'default values' => array(
-                    array(),
-                    array(
-                        'public' => 0, // `public` is one of the default metas in `wpmu_create_blog()' function prior to WordPress 5.1.0.
-                        'WPLANG' => 'en_US', // WPLANG is another default meta in `wpmu_create_blog()` function prior to WordPress 5.1.0.
-                    ),
-                ),
-                'public site'    => array(
-                    array(
-                        'public' => 1,
-                    ),
-                    array(
-                        'public' => 1,
-                        'WPLANG' => 'en_US',
-                    ),
-                ),
-                'allowed_keys'   => array(
-                    array(
-                        'public'   => -1,
-                        'archived' => 0,
-                        'mature'   => 0,
-                        'spam'     => 0,
-                        'deleted'  => 0,
-                        'lang_id'  => 11,
-
-                    ),
-                    array(
-                        'public'   => -1,
-                        'WPLANG'   => 'en_US',
-                        'archived' => 0,
-                        'mature'   => 0,
-                        'spam'     => 0,
-                        'deleted'  => 0,
-                        'lang_id'  => 11,
-                    ),
-                ),
-                'extra meta key' => array(
-                    array(
-                        'foo' => 'bar',
-                    ),
-                    array(
-                        'public' => 0,
-                        'foo'    => 'bar',
-                        'WPLANG' => 'en_US',
-                    ),
-                ),
-            );
-        }
-    }
-
-endif;
+        $this->assertSame( 'http://testsite1.example.org/test', get_blog_details( $blog_id )->siteurl );
+        $this->assertSame( 'http://testsite1.example.org/test', get_site( $blog_id )->siteurl );
+
+        remove_action( 'populate_options', array( $this, 'populate_options_callback' ) );
+    }
+
+    /**
+     * Populate options callback to warm cache for blog-details / site-details cache group
+     */
+    public function populate_options_callback() {
+        // Cache blog details.
+        $blog_id = get_current_blog_id();
+        get_blog_details( $blog_id );
+        get_site( $blog_id )->siteurl;
+        // Set siteurl.
+        update_option( 'siteurl', 'http://testsite1.example.org/test' );
+    }
+
+    /**
+     * Tests whether all expected meta are provided in deprecated `wpmu_new_blog` action.
+     *
+     * @dataProvider data_wpmu_new_blog_action_backward_compatible
+     *
+     * @ticket 46351
+     */
+    public function test_wpmu_new_blog_action_backward_compatible( $meta, $expected_meta ) {
+        // We are testing deprecated hook. Register it to expected deprecated notices.
+        $this->setExpectedDeprecated( 'wpmu_new_blog' );
+        add_action( 'wpmu_new_blog', array( $this, 'wpmu_new_blog_callback' ), 10, 6 );
+
+        wpmu_create_blog( 'testsite1.example.org', '/new-blog/', 'New Blog', get_current_user_id(), $meta, 1 );
+
+        $this->assertSameSetsWithIndex( $expected_meta, $this->wp_initialize_site_meta );
+
+        $this->wp_initialize_site_meta = array();
+    }
+
+    /**
+     * @ticket 42251
+     */
+    public function test_get_site_not_found_cache() {
+        $new_site_id = $this->_get_next_site_id();
+        $this->assertNull( get_site( $new_site_id ) );
+
+        $num_queries = get_num_queries();
+        $this->assertNull( get_site( $new_site_id ) );
+        $this->assertSame( $num_queries, get_num_queries() );
+    }
+
+    /**
+     * @ticket 42251
+     */
+    public function test_get_site_not_found_cache_clear() {
+        $new_site_id = $this->_get_next_site_id();
+        $this->assertNull( get_site( $new_site_id ) );
+
+        $new_site = self::factory()->blog->create_and_get();
+
+        // Double-check we got the ID of the new site correct.
+        $this->assertEquals( $new_site_id, $new_site->blog_id );
+
+        // Verify that if we fetch the site now, it's no longer false.
+        $fetched_site = get_site( $new_site_id );
+        $this->assertInstanceOf( 'WP_Site', $fetched_site );
+        $this->assertEquals( $new_site_id, $fetched_site->blog_id );
+    }
+
+    /**
+     * Gets the ID of the next site that will get inserted
+     * @return int
+     */
+    protected function _get_next_site_id() {
+        global $wpdb;
+        // Create an entry.
+        static::factory()->blog->create();
+        // Get the ID after it.
+        return (int) $wpdb->get_var( 'SELECT blog_id FROM ' . $wpdb->blogs . ' ORDER BY blog_ID DESC LIMIT 1' ) + 1;
+    }
+
+    /**
+     * Capture the $meta value passed to the wpmu_new_blog action and compare it.
+     */
+    public function wpmu_new_blog_callback( $blog_id, $user_id, $domain, $path, $network_id, $meta ) {
+        $this->wp_initialize_site_meta = $meta;
+    }
+
+    public function data_wpmu_new_blog_action_backward_compatible() {
+        return array(
+            'default values' => array(
+                array(),
+                array(
+                    'public' => 0, // `public` is one of the default metas in `wpmu_create_blog()' function prior to WordPress 5.1.0.
+                    'WPLANG' => 'en_US', // WPLANG is another default meta in `wpmu_create_blog()` function prior to WordPress 5.1.0.
+                ),
+            ),
+            'public site'    => array(
+                array(
+                    'public' => 1,
+                ),
+                array(
+                    'public' => 1,
+                    'WPLANG' => 'en_US',
+                ),
+            ),
+            'allowed_keys'   => array(
+                array(
+                    'public'   => -1,
+                    'archived' => 0,
+                    'mature'   => 0,
+                    'spam'     => 0,
+                    'deleted'  => 0,
+                    'lang_id'  => 11,
+
+                ),
+                array(
+                    'public'   => -1,
+                    'WPLANG'   => 'en_US',
+                    'archived' => 0,
+                    'mature'   => 0,
+                    'spam'     => 0,
+                    'deleted'  => 0,
+                    'lang_id'  => 11,
+                ),
+            ),
+            'extra meta key' => array(
+                array(
+                    'foo' => 'bar',
+                ),
+                array(
+                    'public' => 0,
+                    'foo'    => 'bar',
+                    'WPLANG' => 'en_US',
+                ),
+            ),
+        );
+    }
+}