Preserve generic hook removal behavior

Author: chubes4

packages/runtime-core/src/runtime-php-snippets.ts

@@ -15,7 +15,8 @@ function ${snapshot}(string $hook_name): array {
     if (!isset($wp_filter[$hook_name]) || !isset($wp_filter[$hook_name]->callbacks)) {
         return $snapshot;
     }
-    foreach ($wp_filter[$hook_name]->callbacks as $priority => $callbacks) {
+    $callbacks_by_priority = $wp_filter[$hook_name]->callbacks;
+    foreach ($callbacks_by_priority as $priority => $callbacks) {
         foreach (array_keys($callbacks) as $callback_id) {
             $snapshot[$priority . ':' . $callback_id] = true;
         }
@@ -33,11 +34,9 @@ function ${defer}(string $hook_name, array $before): array {
             if (isset($before[$priority . ':' . $callback_id])) {
                 continue;
             }
-            $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
-            unset($wp_filter[$hook_name]->callbacks[$priority][$callback_id]);
-        }
-        if (empty($wp_filter[$hook_name]->callbacks[$priority])) {
-            unset($wp_filter[$hook_name]->callbacks[$priority]);
+            if (isset($callback['function']) && remove_action($hook_name, $callback['function'], (int) $priority)) {
+                $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
+            }
         }
     }
     usort($deferred, static function (array $left, array $right): int { return ($left['priority'] ?? 10) <=> ($right['priority'] ?? 10); });

packages/runtime-playground/src/bench-command-handlers.ts

@@ -1181,7 +1181,8 @@ function wp_codebox_bench_snapshot_wordpress_hook_callbacks(string $hook_name):
     if (!isset($wp_filter[$hook_name]) || !isset($wp_filter[$hook_name]->callbacks)) {
         return $snapshot;
     }
-    foreach ($wp_filter[$hook_name]->callbacks as $priority => $callbacks) {
+    $callbacks_by_priority = $wp_filter[$hook_name]->callbacks;
+    foreach ($callbacks_by_priority as $priority => $callbacks) {
         foreach (array_keys($callbacks) as $callback_id) {
             $snapshot[$priority . ':' . $callback_id] = true;
         }
@@ -1200,11 +1201,9 @@ function wp_codebox_bench_defer_new_wordpress_hook_callbacks(string $hook_name,
             if (isset($before[$priority . ':' . $callback_id])) {
                 continue;
             }
-            $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
-            unset($wp_filter[$hook_name]->callbacks[$priority][$callback_id]);
-        }
-        if (empty($wp_filter[$hook_name]->callbacks[$priority])) {
-            unset($wp_filter[$hook_name]->callbacks[$priority]);
+            if (isset($callback['function']) && remove_action($hook_name, $callback['function'], (int) $priority)) {
+                $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
+            }
         }
     }
     usort($deferred, static function (array $left, array $right): int {

packages/runtime-playground/src/phpunit-command-handlers.ts

@@ -497,7 +497,8 @@ function pg_snapshot_wordpress_hook_callbacks(string $hook_name): array {
     if (!isset($wp_filter[$hook_name]) || !isset($wp_filter[$hook_name]->callbacks)) {
         return $snapshot;
     }
-    foreach ($wp_filter[$hook_name]->callbacks as $priority => $callbacks) {
+    $callbacks_by_priority = $wp_filter[$hook_name]->callbacks;
+    foreach ($callbacks_by_priority as $priority => $callbacks) {
         foreach (array_keys($callbacks) as $callback_id) {
             $snapshot[$priority . ':' . $callback_id] = true;
         }
@@ -513,12 +514,10 @@ function pg_remove_new_wordpress_hook_callbacks(string $hook_name, array $before
     foreach ($wp_filter[$hook_name]->callbacks as $priority => $callbacks) {
         foreach (array_keys($callbacks) as $callback_id) {
             if (!isset($before[$priority . ':' . $callback_id])) {
-                unset($wp_filter[$hook_name]->callbacks[$priority][$callback_id]);
+                $callback = $callbacks[$callback_id];
+                if (isset($callback['function'])) remove_action($hook_name, $callback['function'], (int) $priority);
             }
         }
-        if (empty($wp_filter[$hook_name]->callbacks[$priority])) {
-            unset($wp_filter[$hook_name]->callbacks[$priority]);
-        }
     }
 }
 
@@ -528,16 +527,15 @@ function pg_defer_new_wordpress_hook_callbacks(string $hook_name, array $before)
     if (!isset($wp_filter[$hook_name]) || !isset($wp_filter[$hook_name]->callbacks)) {
         return $deferred;
     }
-    foreach ($wp_filter[$hook_name]->callbacks as $priority => $callbacks) {
+    $callbacks_by_priority = $wp_filter[$hook_name]->callbacks;
+    foreach ($callbacks_by_priority as $priority => $callbacks) {
         foreach ($callbacks as $callback_id => $callback) {
             if (isset($before[$priority . ':' . $callback_id])) {
                 continue;
             }
-            $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
-            unset($wp_filter[$hook_name]->callbacks[$priority][$callback_id]);
-        }
-        if (empty($wp_filter[$hook_name]->callbacks[$priority])) {
-            unset($wp_filter[$hook_name]->callbacks[$priority]);
+            if (isset($callback['function']) && remove_action($hook_name, $callback['function'], (int) $priority)) {
+                $deferred[] = array('priority' => (int) $priority, 'callback' => $callback);
+            }
         }
     }
     usort($deferred, static function (array $left, array $right): int { return $left['priority'] <=> $right['priority']; });

tests/runtime-php-snippets.test.ts

@@ -30,6 +30,16 @@ $GLOBALS['calls'] = array();
 
 function did_action($hook_name) { return (int) ($GLOBALS['wp_actions'][$hook_name] ?? 0); }
 function wp_get_abilities() { return array('before' => true, 'after' => true); }
+function remove_action($hook_name, $callback, $priority = 10) {
+    foreach ($GLOBALS['wp_filter'][$hook_name]->callbacks[$priority] ?? array() as $callback_id => $registered) {
+        if (($registered['function'] ?? null) === $callback) {
+            unset($GLOBALS['wp_filter'][$hook_name]->callbacks[$priority][$callback_id]);
+            if (empty($GLOBALS['wp_filter'][$hook_name]->callbacks[$priority])) unset($GLOBALS['wp_filter'][$hook_name]->callbacks[$priority]);
+            return true;
+        }
+    }
+    return false;
+}
 
 $GLOBALS['wp_filter']['init']->callbacks[10]['existing'] = array('function' => static function () { $GLOBALS['calls'][] = 'existing'; }, 'accepted_args' => 0);
 $state = contained_runtime_test_component_lifecycle_replay_prepare();