Changeset 29503 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

08/15/2014 03:40:48 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Avoid undefined index notices in WP_UnitTestCase::_restore_hooks().

props kevinlangleyjr.
fixes #29123.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -68 +68 @@
 
         /**
-         * Saves the action and filter-related globals so they can be restored later
+         * Saves the action and filter-related globals so they can be restored later.
          *
          * Stores $merged_filters, $wp_actions, $wp_current_filter, and $wp_filter
-         * on a class variable so they can be restored on tearDown() using _restore_hooks()
-         * @global array $merged_filters
-         * @global array $wp_actions
-         * @global array $wp_current_filter
-         * @global array $wp_filter
-         * @return void
-         */
-        protected function _backup_hooks() {
-                $globals = array( 'merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter' );
-                foreach ( $globals as $key ) {
-                        self::$hooks_saved[ $key ] = $GLOBALS[ $key ];
-                }
-        }
-
-        /**
-         * Restores the hook-related globals to their state at setUp()
-         *
-         * so that future tests aren't affected by hooks set during this last test
+         * on a class variable so they can be restored on tearDown() using _restore_hooks().
          *
          * @global array $merged_filters
@@ -96 +79 @@
          * @return void
          */
-        protected function _restore_hooks(){
+        protected function _backup_hooks() {
                 $globals = array( 'merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter' );
                 foreach ( $globals as $key ) {
-                        $GLOBALS[ $key ] = self::$hooks_saved[ $key ];
+                        self::$hooks_saved[ $key ] = $GLOBALS[ $key ];
+                }
+        }
+
+        /**
+         * Restores the hook-related globals to their state at setUp()
+         * so that future tests aren't affected by hooks set during this last test.
+         *
+         * @global array $merged_filters
+         * @global array $wp_actions
+         * @global array $wp_current_filter
+         * @global array $wp_filter
+         * @return void
+         */
+        protected function _restore_hooks() {
+                $globals = array( 'merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter' );
+                foreach ( $globals as $key ) {
+                        if ( isset( self::$hooks_saved[ $key ] ) ) {
+                                $GLOBALS[ $key ] = self::$hooks_saved[ $key ];
+                        }
                 }
         }