Use symfony 4 event dispatcher

borrowworks · Dec 9, 2020 · 39612c8 · 39612c8
1 parent dbd76b8
commit 39612c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor
-composer.lock
+composer.lock
+.idea
diff --git a/composer.json b/composer.json
@@ -14,11 +14,12 @@
     "ext-soap": "*",
     "ext-xml": "*",
     "doctrine/collections": "~1.3",
+    "psr/event-dispatcher": "^1.0",
     "psr/log": "^1.0",
-    "symfony/console": "~2.8|~3.0|~4.0",
-    "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-    "symfony/filesystem": "~2.8|~3.0|~4.0",
-    "symfony/validator": "~2.8|~3.0|~4.0"
+    "symfony/console": "~4.0",
+    "symfony/event-dispatcher": "~4.0",
+    "symfony/filesystem": "~4.0",
+    "symfony/validator": "~4.0"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.3.2",
@@ -34,10 +35,10 @@
     "php-http/message": "^1.6",
     "php-http/message-factory": "^1.0",
     "php-http/mock-client": "^1.0",
-    "php-vcr/php-vcr": "~1.3.2",
+    "php-vcr/php-vcr": "1.4.5",
     "php-vcr/phpunit-testlistener-vcr": "3.0",
     "phpro/grumphp": "~0.11",
-    "phpspec/phpspec": "~3.2",
+    "phpspec/phpspec": "~7.0",
     "phpspec/prophecy": "~1.7",
     "phpunit/phpunit": "~6.0",
     "psr/http-message": "^1.0",

diff --git a/src/Phpro/SoapClient/Client.php b/src/Phpro/SoapClient/Client.php
@@ -88,7 +88,7 @@ public function changeSoapLocation(string $location)
     protected function call(string $method, RequestInterface $request): ResultInterface
     {
         $requestEvent = new Event\RequestEvent($this, $method, $request);
-        $this->dispatcher->dispatch(Events::REQUEST, $requestEvent);
+        $this->dispatcher->dispatch($requestEvent, Events::REQUEST);
 
         try {
             $arguments = ($request instanceof MultiArgumentRequestInterface) ? $request->getArguments() : [$request];
@@ -103,11 +103,11 @@ protected function call(string $method, RequestInterface $request): ResultInterf
             }
         } catch (\Exception $exception) {
             $soapException = SoapException::fromThrowable($exception);
-            $this->dispatcher->dispatch(Events::FAULT, new Event\FaultEvent($this, $soapException, $requestEvent));
+            $this->dispatcher->dispatch(new Event\FaultEvent($this, $soapException, $requestEvent), Events::FAULT);
             throw $soapException;
         }
 
-        $this->dispatcher->dispatch(Events::RESPONSE, new Event\ResponseEvent($this, $requestEvent, $result));
+        $this->dispatcher->dispatch(new Event\ResponseEvent($this, $requestEvent, $result), Events::RESPONSE);
         return $result;
     }
 }