Changeset 37475 for trunk/tests/phpunit/tests/multisite/bootstrap.php

Timestamp:

05/20/2016 08:56:54 PM (9 years ago)

Author:

jeremyfelt

Message:

Multisite: Wrap the main bootstrap process in a function

Introduce ms_load_current_site_and_network. This is used by core during the multisite bootstrap process to populate the $current_site and $current_blog globals based on a requested domain and path.

Return values from this function inform ms-settings.php as to whether a page view should continue, ms_not_installed() should fire, or a redirect to a new location should occur.

This was previously a procedural block in ms-settings.php. Wrapping this code and providing specific return values allows us to write tests that do not rely on the manual and repeated inclusion of ms-settings.php.

This should not be used by plugins or themes. Please.

See #34941.

File:

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

trunk/tests/phpunit/tests/multisite/bootstrap.php

@@ -159 +159 @@
         );
 
-        $this->_setup_host_request( $domain, $path );
+        ms_load_current_site_and_network( $domain, $path );
         $actual = array(
             'network_id' => $current_blog->site_id,
             'site_id' => $current_blog->blog_id,
         );
-        $this->_setup_host_request( WP_TESTS_DOMAIN, '/' );
+        ms_load_current_site_and_network( WP_TESTS_DOMAIN, '/' );
 
         $this->assertEqualSetsWithIndex( $expected, $actual );
@@ -198 +198 @@
         );
         add_filter( 'site_by_path_segments_count', array( $this, 'filter_path_segments_to_two' ) );
-        $this->_setup_host_request( 'wordpress.org', '/foo/bar/' );
+        ms_load_current_site_and_network( 'wordpress.org', '/foo/bar/' );
         $actual = array(
             'network_id' => $current_blog->site_id,
@@ -204 +204 @@
         );
         remove_filter( 'site_by_path_segments_count', array( $this, 'filter_path_segments_to_two' ) );
-        $this->_setup_host_request( WP_TESTS_DOMAIN, '/' );
+        ms_load_current_site_and_network( WP_TESTS_DOMAIN, '/' );
 
         $this->assertEqualSetsWithIndex( $expected, $actual );
@@ -212 +212 @@
         return 2;
     }
-
-    /**
-     * Reset various globals required for a 'clean' multisite boot.
-     *
-     * The $wpdb and $table_prefix globals are required for ms-settings.php to
-     * load properly.
-     *
-     * @param string $domain HTTP_HOST of the bootstrap request.
-     * @param string $path   REQUEST_URI of the boot strap request.
-     */
-    function _setup_host_request( $domain, $path ) {
-        global $current_site, $current_blog, $table_prefix, $wpdb;
-
-        $table_prefix = WP_TESTS_TABLE_PREFIX;
-        $current_site = $current_blog = null;
-        $_SERVER['HTTP_HOST'] = $domain;
-        $_SERVER['REQUEST_URI'] = $path;
-
-        include ABSPATH . '/wp-includes/ms-settings.php';
-    }
 }