Ticket #43621: 43621.wp_hook.diff

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

@@ -42 +42 @@
         private $current_priority = array();
 
         /**
+         * The current callback that is running.
+         *
+         * @since 5.0
+         * @var callable
+         */
+        private $current_callback = null;
+        /**
+
+        /**
+         * The previous callback that ran before the current one.
+         *
+         * @since 5.0
+         * @var callable
+         */
+        private $previous_callback = null;
+
+        /**
          * Number of levels this hook can be recursively called.
          *
          * @since 4.7.0
@@ -279 +296 @@
                                         $args[0] = $value;
                                 }
 
+                                $this->current_callback = $the_;
+
                                 // Avoid the array_slice if possible.
                                 if ( $the_['accepted_args'] == 0 ) {
                                         $value = call_user_func_array( $the_['function'], array() );
@@ -287 +306 @@
                                 } else {
                                         $value = call_user_func_array( $the_['function'], array_slice( $args, 0, (int) $the_['accepted_args'] ) );
                                 }
+
+                                $this->current_callback = null;
+                                $this->previous_callback = $the_;
                         }
                 } while ( false !== next( $this->iterations[ $nesting_level ] ) );
 
@@ -353 +375 @@
         }
 
         /**
+         * Return the current callback that is running.
+         *
+         * @since 5.0
+         *
+         * @return callable|null Callback that is running or null if no callback running.
+         */
+        public function current_callback() {
+                return $this->current_callback;
+        }
+
+        /**
+         * Return the callback that has just run, or ran before the current callback.
+         *
+         * @since 5.0
+         *
+         * @return callable|null Callback that ran previously or null if no callback ran previously.
+         */
+        public function previous_callback() {
+                return $this->previous_callback;
+        }
+
+        /**
          * Normalizes filters set up before WordPress has initialized to WP_Hook objects.
          *
          * @since 4.7.0

tests/phpunit/tests/filters.php

@@ -380 +380 @@
                 global $wp_filter;
                 $this->current_priority = $wp_filter['the_content']->current_priority();
         }
+
+        /**
+         * @ticket 43621
+         */
+        public function test_current_filter_current_previous_callback() {
+                global $_current_previous_callbacks;
+
+                $_current_previous_callbacks = array(
+                        array( $this, '_current_previous_callback_one' ),
+                        array( $this, '_current_previous_callback_two' ),
+                );
+
+                add_action( 'test_current_previous_callback', $_current_previous_callbacks[0] );
+                add_action( 'test_current_previous_callback', $_current_previous_callbacks[1] );
+
+                do_action( 'test_current_previous_callback' );
+        }
+
+        public function _current_previous_callback_one() {
+                global $wp_filter, $_current_previous_callbacks;
+
+                $current_filter     = $wp_filter[ current_filter() ];
+                $current_callback   = $current_filter->current_callback();
+                $previous_callback  = $current_filter->previous_callback();
+
+                $this->assertEquals( $_current_previous_callbacks[0], $current_callback['function'] );
+                $this->assertNull( $previous_callback );
+        }
+
+        public function _current_previous_callback_two() {
+                global $wp_filter, $_current_previous_callbacks;
+
+                $current_filter     = $wp_filter[ current_filter() ];
+                $current_callback   = $current_filter->current_callback();
+                $previous_callback  = $current_filter->previous_callback();
+
+                $this->assertEquals( $_current_previous_callbacks[1], $current_callback['function'] );
+                $this->assertEquals( $_current_previous_callbacks[0], $previous_callback['function'] );
+        }
 }