Merge pull request #9 from thorau/feature/fix-deprecations-of-event-d…

…ispatching

fixed deprecations of event dispatching

src/Helper/AbstractHelper.php

@@ -12,6 +12,7 @@
 namespace Ivory\GoogleMap\Helper;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 
 /**
  * @author GeLo <[email protected]>
@@ -41,6 +42,6 @@ public function getEventDispatcher()
      */
     public function setEventDispatcher($eventDispatcher)
     {
-        $this->eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
     }
 }

src/Helper/ApiHelper.php

@@ -26,7 +26,7 @@ class ApiHelper extends AbstractHelper
      */
     public function render(array $objects)
     {
-        $this->getEventDispatcher()->dispatch(ApiEvents::JAVASCRIPT, $event = new ApiEvent($objects));
+        $this->getEventDispatcher()->dispatch($event = new ApiEvent($objects), ApiEvents::JAVASCRIPT);
 
         return $event->getCode();
     }

src/Helper/PlaceAutocompleteHelper.php

@@ -51,7 +51,7 @@ public function renderJavascript(Autocomplete $autocomplete)
      */
     private function doRender(Autocomplete $autocomplete, $eventName)
     {
-        $this->getEventDispatcher()->dispatch($eventName, $event = new PlaceAutocompleteEvent($autocomplete));
+        $this->getEventDispatcher()->dispatch($event = new PlaceAutocompleteEvent($autocomplete), $eventName);
 
         return $event->getCode();
     }

src/Helper/StaticMapHelper.php

@@ -132,7 +132,7 @@ public function setChannel($channel)
      */
     public function render(Map $map)
     {
-        $this->getEventDispatcher()->dispatch(StaticMapEvents::HTML, $event = new StaticMapEvent($map));
+        $this->getEventDispatcher()->dispatch($event = new StaticMapEvent($map), StaticMapEvents::HTML);
 
         $query = preg_replace('/(%5B[0-9]+%5D)+=/', '=', http_build_query($event->getParameters(), '', '&'));
         $url = 'https://maps.googleapis.com/maps/api/staticmap?'.$query;

src/Helper/Subscriber/Image/StaticSubscriber.php

@@ -15,6 +15,7 @@
 use Ivory\GoogleMap\Helper\Subscriber\DelegateSubscriberInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 
 /**
  * @author GeLo <[email protected]>
@@ -26,11 +27,13 @@ class StaticSubscriber implements DelegateSubscriberInterface
      */
     public function handle(Event $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
+        $dispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
         $delegates = static::getDelegatedSubscribedEvents();
 
-        if (isset($delegates[$eventName])) {
+        if (isset($delegates[$eventName]) && $dispatcher !== null) {
             foreach ($delegates[$eventName] as $delegate) {
-                $eventDispatcher->dispatch($delegate, $event);
+                $dispatcher->dispatch($event, $delegate);
             }
         }
     }