Changeset 26006

Timestamp:

11/04/2013 10:46:44 PM (11 years ago)

Author:

wonderboymusic

Message:

WP_UnitTestCase::go_to() tried its best to clean up global space, but ultimately fell short. Because it was blowing away WP every time it was called, it was dropping all the query vars that were registered for custom taxonomies and custom post types (ouch).

Introduces _cleanup_query_vars(). This is a prerequisite for the unit tests on #20767. All unit tests pass with this change.

See #20767.
Fixes #25818.

Location:

trunk

Files:

• src/wp-includes/class-wp.php (modified) (1 diff)
• tests/phpunit/includes/testcase.php (modified) (1 diff)
• tests/phpunit/includes/utils.php (modified) (1 diff)

trunk/src/wp-includes/class-wp.php

@@ -606 +606 @@
         $this->handle_404();
         $this->register_globals();
-        
+
         /**
          * Fires once the WordPress environment has been set up.

trunk/tests/phpunit/includes/testcase.php

@@ -187 +187 @@
         $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
         $GLOBALS['wp'] = new WP();
-
-        // clean out globals to stop them polluting wp and wp_query
-        foreach ($GLOBALS['wp']->public_query_vars as $v) {
-            unset($GLOBALS[$v]);
-        }
-        foreach ($GLOBALS['wp']->private_query_vars as $v) {
-            unset($GLOBALS[$v]);
-        }
+        _cleanup_query_vars();
 
         $GLOBALS['wp']->main($parts['query']);

trunk/tests/phpunit/includes/utils.php

@@ -364 +364 @@
     unset( $GLOBALS['wp_taxonomies'][$taxonomy_name] );
 }
+
+function _cleanup_query_vars() {
+    // clean out globals to stop them polluting wp and wp_query
+    foreach ( $GLOBALS['wp']->public_query_vars as $v )
+        unset( $GLOBALS[$v] );
+
+    foreach ( $GLOBALS['wp']->private_query_vars as $v )
+        unset( $GLOBALS[$v] );
+
+    foreach ( get_taxonomies( array() , 'objects' ) as $t ) {
+        if ( ! empty( $t->query_var ) )
+            $GLOBALS['wp']->add_query_var( $t->query_var );
+    }
+
+    foreach ( get_post_types( array() , 'objects' ) as $t ) {
+        if ( ! empty( $t->query_var ) )
+            $GLOBALS['wp']->add_query_var( $t->query_var );
+    }
+}