Ticket #37207: 37207.2.diff

tests/phpunit/includes/bootstrap.php

@@ -86 +86 @@
 // Delete any default posts & related data
 _delete_all_posts();
 
+// Store query vars to reset after each test
+$GLOBALS['wp_bootstrapped'] = clone $GLOBALS['wp'];
+
 require dirname( __FILE__ ) . '/testcase.php';
 require dirname( __FILE__ ) . '/testcase-rest-api.php';
 require dirname( __FILE__ ) . '/testcase-xmlrpc.php';

tests/phpunit/includes/functions.php

@@ -161 +161 @@
 
         return $uploads;
 }
+
+/**
+ * Restore the global `$wp`'s query vars back to the state after WP was loaded.
+ */
+function _restore_wp_query_vars() {
+        $GLOBALS['wp']->public_query_vars  = $GLOBALS['wp_bootstrapped']->public_query_vars;
+        $GLOBALS['wp']->private_query_vars = $GLOBALS['wp_bootstrapped']->private_query_vars;
+}

tests/phpunit/includes/testcase.php

@@ -151 +151 @@
                 }
                 $wp_query = new WP_Query();
                 $wp = new WP();
+                if ( ! defined( 'WP_RUN_CORE_TESTS' ) || ! WP_RUN_CORE_TESTS ) {
+                        _restore_wp_query_vars();
+                }
                 $post = null;
                 remove_theme_support( 'html5' );
                 remove_filter( 'query', array( $this, '_create_temporary_tables' ) );