Use destruction events at a later runtime

modules/next/next.module

@@ -69,31 +69,21 @@ function next_next_site_preview_alter(array &$preview, array $context) {
  */
 function next_entity_insert(EntityInterface $entity) {
   $event = EntityActionEvent::createFromEntity($entity, EntityActionEventInterface::INSERT_ACTION);
-  drupal_register_shutdown_function('_next_dispatch_entity_action_event', $event);
+  \Drupal::service('next.entity_action_event_dispatcher')->addEvent($event);
 }
 
 /**
  * Implements hook_entity_update().
  */
 function next_entity_update(EntityInterface $entity) {
   $event = EntityActionEvent::createFromEntity($entity, EntityActionEventInterface::UPDATE_ACTION);
-  drupal_register_shutdown_function('_next_dispatch_entity_action_event', $event);
+  \Drupal::service('next.entity_action_event_dispatcher')->addEvent($event);
 }
 
 /**
  * Implements hook_entity_predelete().
  */
 function next_entity_predelete(EntityInterface $entity) {
   $event = EntityActionEvent::createFromEntity($entity, EntityActionEventInterface::DELETE_ACTION);
-  drupal_register_shutdown_function('_next_dispatch_entity_action_event', $event);
-}
-
-/**
- * Helper to dispatch an entity action event.
- *
- * @param \Drupal\next\Event\EntityActionEventInterface $event
- *   The entity action event.
- */
-function _next_dispatch_entity_action_event(EntityActionEventInterface $event) {
-  \Drupal::service('event_dispatcher')->dispatch($event, EntityEvents::ENTITY_ACTION);
+  \Drupal::service('next.entity_action_event_dispatcher')->addEvent($event);
 }

modules/next/next.services.yml

@@ -65,3 +65,9 @@ services:
       ]
     tags:
       - { name: event_subscriber }
+
+  next.entity_action_event_dispatcher:
+    class: Drupal\next\EventSubscriber\EntityActionEventDispatcher
+    arguments: ['@event_dispatcher']
+    tags:
+      - { name: needs_destruction }

modules/next/src/EventSubscriber/EntityActionEventDispatcher.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\next\EventSubscriber;
+
+use Drupal\Core\DestructableInterface;
+use Drupal\next\Event\EntityActionEvent;
+use Drupal\next\Event\EntityEvents;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+final class EntityActionEventDispatcher implements DestructableInterface {
+
+  /**
+   * @var \Drupal\next\Event\EntityActionEvent[]
+   */
+  private array $events = [];
+
+  public function __construct(
+    private EventDispatcherInterface $eventDispatcher
+    ) {
+  }
+
+  public function addEvent(EntityActionEvent $event): void {
+    $this->events[] = $event;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function destruct() {
+    foreach ($this->events as $event) {
+      $this->eventDispatcher->dispatch($event, EntityEvents::ENTITY_ACTION);
+    }
+  }
+
+}