Update Ivory HTTP Adapter to 0.8

kreait · Aug 13, 2015 · ee0f71e · ee0f71e
1 parent 98aef1c
commit ee0f71e
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 84 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "symfony/event-dispatcher": "~2.6"
     },
     "require-dev": {
-        "egeloen/http-adapter": "~0.7.1",
+        "egeloen/http-adapter": "^0.8.0",
         "phpunit/phpunit": "~4.6",
         "fabpot/php-cs-fixer": "~1.6"
     },

diff --git a/src/Event/Subscriber/TapeRecorderSubscriber.php b/src/Event/Subscriber/TapeRecorderSubscriber.php
@@ -13,13 +13,12 @@
 namespace Kreait\Ivory\HttpAdapter\Event\Subscriber;
 
 use Ivory\HttpAdapter\Event\Events;
-use Ivory\HttpAdapter\Event\ExceptionEvent;
-use Ivory\HttpAdapter\Event\PostSendEvent;
-use Ivory\HttpAdapter\Event\PreSendEvent;
+use Ivory\HttpAdapter\Event\RequestCreatedEvent;
+use Ivory\HttpAdapter\Event\RequestErroredEvent;
+use Ivory\HttpAdapter\Event\RequestSentEvent;
 use Ivory\HttpAdapter\HttpAdapterException;
 use Kreait\Ivory\HttpAdapter\Event\TapeRecorder\Tape;
 use Kreait\Ivory\HttpAdapter\Event\TapeRecorder\TapeRecorderException;
-use Kreait\Ivory\HttpAdapter\Event\TapeRecorder\TrackInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -85,9 +84,9 @@ public function __construct($path)
     public static function getSubscribedEvents()
     {
         return [
-            Events::PRE_SEND        => ['onPreSend', 400],
-            Events::POST_SEND       => ['onPostSend', 400],
-            Events::EXCEPTION       => ['onException', 400],
+            Events::REQUEST_CREATED => ['onPreSend', 400],
+            Events::REQUEST_SENT => ['onPostSend', 400],
+            Events::REQUEST_ERRORED => ['onException', 400],
         ];
     }
 
@@ -165,11 +164,11 @@ public function stopRecording()
     /**
      * On pre send event.
      *
-     * @param PreSendEvent $event The pre send event.
+     * @param RequestCreatedEvent $event The pre send event.
      *
      * @throws TapeRecorderException|HttpAdapterException
      */
-    public function onPreSend(PreSendEvent $event)
+    public function onPreSend(RequestCreatedEvent $event)
     {
         if (!$this->isRecording) {
             return;
@@ -192,9 +191,9 @@ public function onPreSend(PreSendEvent $event)
      *
      * We reach this event when the request has not been intercepted.
      *
-     * @param PostSendEvent $event The post send event.
+     * @param RequestSentEvent $event The post send event.
      */
-    public function onPostSend(PostSendEvent $event)
+    public function onPostSend(RequestSentEvent $event)
     {
         if (!$this->isRecording) {
             return;
@@ -218,9 +217,9 @@ public function onPostSend(PostSendEvent $event)
     /**
      * We arrive here when the request has successfully been intercepted.
      *
-     * @param ExceptionEvent $event The exception event.
+     * @param RequestErroredEvent $event The exception event.
      */
-    public function onException(ExceptionEvent $event)
+    public function onException(RequestErroredEvent $event)
     {
         if (!$this->isRecording) {
             return;

diff --git a/src/Event/TapeRecorder/Converter.php b/src/Event/TapeRecorder/Converter.php
@@ -86,13 +86,13 @@ public function internalRequestToArray(InternalRequestInterface $request)
         $r = $request->withoutParameter('track');
 
         return [
-            'uri'              => (string) $r->getUri(),
-            'method'           => $r->getMethod(),
+            'uri' => (string) $r->getUri(),
+            'method' => $r->getMethod(),
             'protocol_version' => $r->getProtocolVersion(),
-            'headers'          => $r->getHeaders(),
-            'datas'            => $r->getDatas(),
-            'files'            => $r->getFiles(),
-            'parameters'       => $r->getParameters(),
+            'headers' => $r->getHeaders(),
+            'datas' => $r->getDatas(),
+            'files' => $r->getFiles(),
+            'parameters' => $r->getParameters(),
         ];
     }
 
@@ -125,12 +125,12 @@ public function requestToArray(RequestInterface $request)
         $r = $request->withoutParameter('track');
 
         return [
-            'uri'              => (string) $r->getUri(),
-            'method'           => $r->getMethod(),
+            'uri' => (string) $r->getUri(),
+            'method' => $r->getMethod(),
             'protocol_version' => $r->getProtocolVersion(),
-            'headers'          => $r->getHeaders(),
-            'body'             => (string) $request->getBody(),
-            'parameters'       => $r->getParameters(),
+            'headers' => $r->getHeaders(),
+            'body' => (string) $request->getBody(),
+            'parameters' => $r->getParameters(),
         ];
     }
 
@@ -161,11 +161,11 @@ public function arrayToRequest(array $data)
     public function responseToArray(ResponseInterface $response)
     {
         return [
-            'status_code'      => $response->getStatusCode(),
+            'status_code' => $response->getStatusCode(),
             'protocol_version' => $response->getProtocolVersion(),
-            'headers'          => $response->getHeaders(),
-            'body'             => (string) $response->getBody(),
-            'parameters'       => $response->getParameters(),
+            'headers' => $response->getHeaders(),
+            'body' => (string) $response->getBody(),
+            'parameters' => $response->getParameters(),
         ];
     }
 
@@ -197,7 +197,7 @@ public function arrayToResponse(array $data)
     public function exceptionToArray(HttpAdapterException $exception)
     {
         $array = [
-            'code'    => $exception->getCode(),
+            'code' => $exception->getCode(),
             'message' => $exception->getMessage(),
         ];