Update usage of dispatch command

Author: DariusIII

composer.json

@@ -13,18 +13,18 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.1.3",
         "ext-curl": "*",
-        "symfony/event-dispatcher": ">=2.4,<6",
-        "symfony/options-resolver": ">=2.6,<6",
+        "symfony/event-dispatcher": ">=4.4,<6",
+        "symfony/options-resolver": ">=4.4,<6",
         "guzzlehttp/guzzle": "~6.0",
         "psr/log": "~1.0",
         "doctrine/cache": "^1.6",
         "kevinrob/guzzle-cache-middleware": "^1.2 || ^2.0",
         "rtheunissen/guzzle-log-middleware": "^0.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=5.7,<6",
+        "phpunit/phpunit": ">=5.7,<9",
         "monolog/monolog": ">=1.11.0"
     },
     "suggest": {

lib/Tmdb/Event/HydrationSubscriber.php

@@ -46,7 +46,7 @@ public static function getSubscribedEvents()
     public function hydrate(HydrationEvent $event, $eventName, $eventDispatcher)
     {
         // Possibility to load serialized cache
-        $eventDispatcher->dispatch(TmdbEvents::BEFORE_HYDRATION, $event);
+        $eventDispatcher->dispatch( $event,TmdbEvents::BEFORE_HYDRATION);
 
         if ($event->isPropagationStopped()) {
             return $event->getSubject();
@@ -56,7 +56,7 @@ public function hydrate(HydrationEvent $event, $eventName, $eventDispatcher)
         $event->setSubject($subject);
 
         // Possibility to cache the data
-        $eventDispatcher->dispatch(TmdbEvents::AFTER_HYDRATION, $event);
+        $eventDispatcher->dispatch( $event, TmdbEvents::AFTER_HYDRATION);
 
         return $event->getSubject();
     }

lib/Tmdb/Event/RequestSubscriber.php

@@ -40,7 +40,7 @@ public static function getSubscribedEvents()
     public function send(RequestEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
         // Preparation of request parameters / Possibility to use for logging and caching etc.
-        $eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
+        $eventDispatcher->dispatch($event,TmdbEvents::BEFORE_REQUEST);
 
         if ($event->isPropagationStopped() && $event->hasResponse()) {
             return $event->getResponse();
@@ -50,7 +50,7 @@ public function send(RequestEvent $event, $eventName, EventDispatcherInterface $
         $event->setResponse($response);
 
         // Possibility to cache the request
-        $eventDispatcher->dispatch(TmdbEvents::AFTER_REQUEST, $event);
+        $eventDispatcher->dispatch($event, TmdbEvents::AFTER_REQUEST);
 
         return $response;
     }

lib/Tmdb/Factory/AbstractFactory.php

@@ -248,7 +248,7 @@ protected function hydrate(AbstractModel $subject, $data = [])
         $event->setLastRequest($httpClient->getLastRequest());
         $event->setLastResponse($httpClient->getLastResponse());
 
-        $this->getHttpClient()->getEventDispatcher()->dispatch(TmdbEvents::HYDRATE, $event);
+        $this->getHttpClient()->getEventDispatcher()->dispatch($event, TmdbEvents::HYDRATE);
 
         return $event->getSubject();
     }

lib/Tmdb/HttpClient/HttpClient.php

@@ -234,7 +234,7 @@ private function send($path, $method, array $parameters = [], array $headers = [
         );
 
         $event = new RequestEvent($request);
-        $this->eventDispatcher->dispatch(TmdbEvents::REQUEST, $event);
+        $this->eventDispatcher->dispatch($event, TmdbEvents::REQUEST);
 
         $this->lastResponse = $event->getResponse();
 

test/Tmdb/Tests/Event/RequestSubscriberTest.php

@@ -43,7 +43,7 @@ public function canReturnEarlyResponse()
         $eventDispatcher->addSubscriber(new RequestSubscriber());
 
         $requestEvent = new RequestEvent(new Request('/', '1337'));
-        $eventDispatcher->dispatch(TmdbEvents::REQUEST, $requestEvent);
+        $eventDispatcher->dispatch($requestEvent, TmdbEvents::REQUEST);
 
         $response = $requestEvent->getResponse();
 

test/Tmdb/Tests/HttpClient/HttpClientTest.php

@@ -49,7 +49,7 @@ public function shouldCallGet()
         $this->setUp();
 
         $this->adapter
-            ->expects($this->once())
+            ->expect($this->once())
             ->method('get')
             ->will($this->returnValue([]))
         ;

test/Tmdb/Tests/HttpClient/Plugin/AcceptJsonHeaderPluginTest.php

@@ -31,7 +31,7 @@ public function shouldAddToken()
 
         $eventDispatcher = new EventDispatcher();
         $eventDispatcher->addSubscriber(new AcceptJsonHeaderPlugin());
-        $eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
+        $eventDispatcher->dispatch($event, TmdbEvents::BEFORE_REQUEST);
 
         $this->assertEquals('application/json', (string) $event->getRequest()->getHeaders()->get('Accept'));
     }

test/Tmdb/Tests/HttpClient/Plugin/AdultFilterPluginTest.php

@@ -31,7 +31,7 @@ public function shouldFilter()
 
         $eventDispatcher = new EventDispatcher();
         $eventDispatcher->addSubscriber(new AdultFilterPlugin(false));
-        $eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
+        $eventDispatcher->dispatch($event, TmdbEvents::BEFORE_REQUEST);
 
         $this->assertEquals('false', (string) $event->getRequest()->getParameters()->get('include_adult'));
     }

test/Tmdb/Tests/HttpClient/Plugin/ApiTokenPluginTest.php

@@ -34,7 +34,7 @@ public function shouldAddToken()
 
         $eventDispatcher = new EventDispatcher();
         $eventDispatcher->addSubscriber(new ApiTokenPlugin($token));
-        $eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
+        $eventDispatcher->dispatch($event, TmdbEvents::BEFORE_REQUEST);
 
         $this->assertEquals('abcdef', (string) $event->getRequest()->getParameters()->get('api_key'));
     }