Merge pull request #10 from MASNathan/handle-unknown-json-response

Handled unknown response objects that contain json body

Author: mlanin

src/Debugger.php

@@ -109,10 +109,15 @@ protected function updateResponse(Request $request, Response $response)
         $this->stopProfiling(ProfilingCollection::REQUEST_TIMER);
 
         if ($this->needToUpdateResponse($response)) {
-            $data = $response->getData(true) ?: [];
+            $data = $this->getResponseData($response);
+
+            if ($data === false) {
+                return;
+            }
+
             $data[$this->responseKey] = $this->storage->getData();
 
-            $response->setData($data);
+            $this->setResponseData($response, $data);
         }
     }
 
@@ -124,7 +129,47 @@ protected function updateResponse(Request $request, Response $response)
      */
     protected function needToUpdateResponse(Response $response)
     {
-        return $response instanceof JsonResponse && ! $this->storage->isEmpty();
+        $isJsonResponse = $response instanceof JsonResponse || $response->headers->contains('content-type',
+                'application/json');
+
+        return $isJsonResponse && !$this->storage->isEmpty();
+    }
+
+    /**
+     * Fetches the contents of the response and parses them to an assoc array
+     *
+     * @param Response $response
+     * @return array|bool
+     */
+    protected function getResponseData(Response $response)
+    {
+        if ($response instanceof JsonResponse) {
+            /** @var $response JsonResponse */
+            return $response->getData(true) ?: [];
+        }
+
+        $content = $response->getContent();
+
+        return json_decode($content, true) ?: false;
+    }
+
+    /**
+     * Updates the response content
+     *
+     * @param Response $response
+     * @param array    $data
+     * @return JsonResponse|Response
+     */
+    protected function setResponseData(Response $response, array $data)
+    {
+        if ($response instanceof JsonResponse) {
+            /** @var $response JsonResponse */
+            return $response->setData($data);
+        }
+
+        $content = json_encode($data, JsonResponse::DEFAULT_ENCODING_OPTIONS);
+
+        return $response->setContent($content);
     }
 
     /**