added bc layer for new event dispatcher interface

Author: loevgaard

.travis.yml

@@ -5,8 +5,8 @@ dist: trusty
 sudo: false
 
 php:
-    - 7.2
-    - 7.3
+    - '7.2'
+    - '7.3'
 
 cache:
     yarn: true

phpstan.neon

@@ -19,3 +19,5 @@ parameters:
 
     ignoreErrors:
         - '/Parameter #1 $configuration of method Symfony\Component\DependencyInjection\Extension\Extension::processConfiguration() expects Symfony\Component\Config\Definition\ConfigurationInterface, Symfony\Component\Config\Definition\ConfigurationInterface|null given./'
+        - '/Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface\:\:dispatch\(\) invoked with 2 parameters, 1 required\./'
+        - '/Parameter \#1 \$event of method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface\:\:dispatch\(\) expects object, string given\./'

src/EventListener/AddToCartSubscriber.php

@@ -75,12 +75,12 @@ public function track(): void
                 ->setItemPrice($this->moneyFormatter->format($item->getDiscountedUnitPrice()))
             ;
 
-            $this->eventDispatcher->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $item));
+            $this->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $item));
 
             $builder->addContent($contentBuilder);
         }
 
-        $this->eventDispatcher->dispatch(AddToCartBuilder::EVENT_NAME, new BuilderEvent($builder, $order));
+        $this->dispatch(AddToCartBuilder::EVENT_NAME, new BuilderEvent($builder, $order));
 
         $this->tagBag->add(new FbqTag(
             Tags::TAG_ADD_TO_CART,

src/EventListener/PurchaseSubscriber.php

@@ -56,12 +56,12 @@ public function track(ResourceControllerEvent $event): void
                 ->setQuantity($orderItem->getQuantity())
             ;
 
-            $this->eventDispatcher->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $orderItem));
+            $this->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $orderItem));
 
             $builder->addContent($contentBuilder);
         }
 
-        $this->eventDispatcher->dispatch(PurchaseBuilder::EVENT_NAME, new BuilderEvent($builder, $order));
+        $this->dispatch(PurchaseBuilder::EVENT_NAME, new BuilderEvent($builder, $order));
 
         $this->tagBag->add(new FbqTag(
             Tags::TAG_PURCHASE,

src/EventListener/TagSubscriber.php

@@ -10,6 +10,7 @@
 use Setono\TagBagBundle\TagBag\TagBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 
 abstract class TagSubscriber implements EventSubscriberInterface
 {
@@ -31,7 +32,7 @@ abstract class TagSubscriber implements EventSubscriberInterface
     /**
      * @var EventDispatcherInterface
      */
-    protected $eventDispatcher;
+    private $eventDispatcher;
 
     /**
      * @var MoneyFormatter
@@ -40,6 +41,15 @@ abstract class TagSubscriber implements EventSubscriberInterface
 
     public function __construct(TagBagInterface $tagBag, PixelContextInterface $pixelContext, EventDispatcherInterface $eventDispatcher)
     {
+        if (class_exists(LegacyEventDispatcherProxy::class)) {
+            /**
+             * It could return null only if we pass null, but we pass not null in any case
+             *
+             * @var EventDispatcherInterface
+             */
+            $eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+        }
+
         $this->tagBag = $tagBag;
         $this->pixelContext = $pixelContext;
         $this->eventDispatcher = $eventDispatcher;
@@ -59,4 +69,13 @@ protected function getPixels(): array
 
         return $this->pixels;
     }
+
+    protected function dispatch(string $eventName, $event): void
+    {
+        if (class_exists(LegacyEventDispatcherProxy::class)) {
+            $this->eventDispatcher->dispatch($event, $eventName);
+        } else {
+            $this->eventDispatcher->dispatch($eventName, $event);
+        }
+    }
 }

src/EventListener/ViewContentSubscriber.php

@@ -47,11 +47,11 @@ public function track(ResourceControllerEvent $event): void
             ->setQuantity(1)
         ;
 
-        $this->eventDispatcher->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $product));
+        $this->dispatch(ContentBuilder::EVENT_NAME, new BuilderEvent($contentBuilder, $product));
 
         $builder->addContent($contentBuilder);
 
-        $this->eventDispatcher->dispatch(ViewContentBuilder::EVENT_NAME, new BuilderEvent($builder, $product));
+        $this->dispatch(ViewContentBuilder::EVENT_NAME, new BuilderEvent($builder, $product));
 
         $this->tagBag->add(new FbqTag(
             Tags::TAG_VIEW_CONTENT,