diff --git a/core/lib/Drupal/Core/Entity/EntityEvents.php b/core/lib/Drupal/Core/Entity/EntityEvents.php index 3c62b17..7074eca 100644 --- a/core/lib/Drupal/Core/Entity/EntityEvents.php +++ b/core/lib/Drupal/Core/Entity/EntityEvents.php @@ -11,20 +11,6 @@ final class EntityEvents { /** - * Maps entity hook names to event names. - * - * @var string[] - */ - const HOOK_TO_EVENT_MAP = [ - 'create' => self::CREATE, - 'presave' => self::PRESAVE, - 'insert' => self::INSERT, - 'update' => self::UPDATE, - 'predelete' => self::PREDELETE, - 'delete' => self::DELETE, - ]; - - /** * Name of the event fired when creating an entity. * * This hook runs after a new entity object has just been instantiated. diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php index 2173485..ceafc9c 100644 --- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php @@ -168,7 +168,15 @@ protected function invokeHook($hook, EntityInterface $entity) { // Invoke the respective entity-level hook. $this->moduleHandler()->invokeAll('entity_' . $hook, array($entity)); - $hook_to_event_map = EntityEvents::HOOK_TO_EVENT_MAP; + // Map hook names to event names. + $hook_to_event_map = [ + 'create' => EntityEvents::CREATE, + 'presave' => EntityEvents::PRESAVE, + 'insert' => EntityEvents::INSERT, + 'update' => EntityEvents::UPDATE, + 'predelete' => EntityEvents::PREDELETE, + 'delete' => EntityEvents::DELETE, + ]; if (isset($hook_to_event_map[$hook])) { \Drupal::service('event_dispatcher')->dispatch($hook_to_event_map[$hook], new EntityEvent($entity)); }