Changeset 38223 for trunk/tests/phpunit/tests/actions.php

Timestamp:

08/09/2016 01:44:20 AM (10 years ago)

Author:

pento

Message:

Boostrap/Load: Improve forward compatiblity of plugin global backup methods.

[37588] added methods to backup the plugin globals, for ensuring that advanced cache drop-ins don't overwrite hooks that've been added earlier in the load process.

The method for restoring the plugin globals wasn't compatible with the implementation of WP_Hook in #17817. WP_Hook implements ArrayAccess, so _restore_plugin_globals() was treating it as an array, and inadvertantly overwriting the WP_Hook object with a plain array.

To avoid having to re-write this code as part of #17817, we now use add_filter() to restore any hooks that were added by cache drop-ins, which WP_Hook correctly supports.

Props pento, jorbin.
See #36819.

File:

• trunk/tests/phpunit/tests/actions.php (modified) (5 diffs)

trunk/tests/phpunit/tests/actions.php

@@ -333 +333 @@
          */
         function test_backup_plugin_globals_returns_filters() {
-                $backup = _backup_plugin_globals();
+                $backup = _backup_plugin_globals( true );
                 $this->assertArrayHasKey( 'backup_wp_filter',         $backup );
                 $this->assertArrayHasKey( 'backup_wp_actions',        $backup );
@@ -344 +344 @@
          */
         function test_backup_plugin_globals_returns_filters_from_first_time_called() {
-                $backup = _backup_plugin_globals();
-
-                $a = new MockAction();
-                $tag = rand_str();
-
-                add_action($tag, array(&$a, 'action'));
-
-                $new_backup = _backup_plugin_globals();
+                $backup = _backup_plugin_globals( true );
+
+                $a = new MockAction();
+                $tag = rand_str();
+
+                add_action($tag, array(&$a, 'action'));
+
+                $new_backup = _backup_plugin_globals( false );
                 $this->assertEquals( $backup, $new_backup );
         }
@@ -362 +362 @@
                 $original_actions = $wp_actions;
 
-                _backup_plugin_globals();
+                _backup_plugin_globals( true );
 
                 $wp_actions = array();
@@ -379 +379 @@
                 $original_filter = $wp_filter;
 
-                $backup = _backup_plugin_globals();
+                $backup = _backup_plugin_globals( true );
 
                 $a = new MockAction();
@@ -390 +390 @@
 
                 $this->assertNotEquals( $GLOBALS['wp_filter'], $original_filter );
+        }
+
+        /**
+         * @ticket 36819
+         */
+        function test_applied_actions_are_counted_after_restore() {
+                global $wp_actions;
+
+                $action_name = 'this_is_a_fake_action_name';
+                $this->assertArrayNotHasKey( $action_name, $wp_actions );
+
+                do_action( $action_name );
+
+                $this->assertEquals( 1, $wp_actions[ $action_name ] );
+
+                _backup_plugin_globals( true );
+                do_action( $action_name );
+                _restore_plugin_globals();
+
+                $this->assertEquals( 2, $wp_actions[ $action_name ] );
         }