Merge pull request #12 from thorau/feature/fix-event-deprecations

Fixing further event deprecations
bresam · May 28, 2021 · 7309e76 · 7309e76
2 parents 149535b + d587c72
commit 7309e76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Helper/MapHelper.php b/src/Helper/MapHelper.php
@@ -59,7 +59,7 @@ public function renderJavascript(Map $map)
      */
     private function doRender(Map $map, $eventName)
     {
-        $this->getEventDispatcher()->dispatch($eventName, $event = new MapEvent($map));
+        $this->getEventDispatcher()->dispatch($event = new MapEvent($map), $eventName);
 
         return $event->getCode();
     }

diff --git a/src/Helper/Subscriber/AbstractDelegateSubscriber.php b/src/Helper/Subscriber/AbstractDelegateSubscriber.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 
 /**
  * @author GeLo <geloen.eric@gmail.com>
@@ -24,11 +25,13 @@ abstract class AbstractDelegateSubscriber extends AbstractSubscriber implements
      */
     public function handle(Event $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
+        $dispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
         $delegates = static::getDelegatedSubscribedEvents();
 
         if (isset($delegates[$eventName])) {
             foreach ($delegates[$eventName] as $delegate) {
-                $eventDispatcher->dispatch($delegate, $event);
+                $dispatcher->dispatch($event, $delegate);
             }
         }
     }