Refactor HookEventBridge

diff --git a/src/EventSubscriber/HookEventBridge.php b/src/EventSubscriber/HookEventBridge.php
index 3c4e6adc28c61d2dce61279442e921953ada13db..a90c3641032eeb81686e4bb1ac42df4deb74d3b9 100644 (file)
--- a/src/EventSubscriber/HookEventBridge.php
+++ b/src/EventSubscriber/HookEventBridge.php
@@ -58,33 +58,21 @@ final class HookEventBridge
 
        public static function onNamedEvent(NamedEvent $event): void
        {
-               $name = $event->getName();
-
-               $name = static::$eventMapper[$name] ?? $name;
+               static::callHook($event->getName(), '');
+       }
 
-               static::callHook($name, '');
+       public static function onConfigLoadedEvent(ConfigLoadedEvent $event): void
+       {
+               static::callHook($event->getName(), $event->getConfig());
        }
 
        public static function onHtmlFilterEvent(HtmlFilterEvent $event): void
        {
-               $name = $event->getName();
-
-               $name = static::$eventMapper[$name] ?? $name;
-
                $event->setHtml(
-                       static::callHook($name, $event->getHtml())
+                       static::callHook($event->getName(), $event->getHtml())
                );
        }
 
-       public static function onConfigLoadedEvent(ConfigLoadedEvent $event): void
-       {
-               $name = $event->getName();
-
-               $name = static::$eventMapper[$name] ?? $name;
-
-               static::callHook($name, $event->getConfig());
-       }
-
        /**
         * @param string|array $data
         *
@@ -92,6 +80,9 @@ final class HookEventBridge
         */
        private static function callHook(string $name, $data)
        {
+               // If possible, map the event name to the legacy Hook name
+               $name = static::$eventMapper[$name] ?? $name;
+
                // Little hack to allow mocking the Hook call in tests.
                if (static::$mockedCallHook instanceof \Closure) {
                        return (static::$mockedCallHook)->__invoke($name, $data);