Merge pull request #38 from EvolverGroup/feature/json-encode-fails-for-objects

json_encode fails for streams

Conflicts:
      composer.json

Author: weierophinney

composer.json

@@ -28,6 +28,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
+        "ext-json": "*",
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-json": "^2.6.1 || ^3.0",

src/ApiProblemResponse.php

@@ -23,7 +23,7 @@ class ApiProblemResponse extends Response
      *
      * @var int
      */
-    protected $jsonFlags = 0;
+    protected $jsonFlags;
 
     /**
      * @param ApiProblem $apiProblem
@@ -34,9 +34,7 @@ public function __construct(ApiProblem $apiProblem)
         $this->setCustomStatusCode($apiProblem->status);
         $this->setReasonPhrase($apiProblem->title);
 
-        if (defined('JSON_UNESCAPED_SLASHES')) {
-            $this->jsonFlags = constant('JSON_UNESCAPED_SLASHES');
-        }
+        $this->jsonFlags = JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR;
     }
 
     /**

test/ApiProblemResponseTest.php

@@ -32,9 +32,21 @@ public function testApiProblemResponseSetsStatusCodeAndReasonPhrase()
 
     public function testApiProblemResponseBodyIsSerializedApiProblem()
     {
-        $apiProblem = new ApiProblem(400, 'Random error');
+        $additional = [
+            'foo' => fopen('php://memory', 'r')
+        ];
+
+        $expected = [
+            'foo' => null,
+            'type' => 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html',
+            'title' => 'Bad Request',
+            'status' => 400,
+            'detail' => 'Random error',
+        ];
+
+        $apiProblem = new ApiProblem(400, 'Random error', null, null, $additional);
         $response   = new ApiProblemResponse($apiProblem);
-        $this->assertEquals($apiProblem->toArray(), json_decode($response->getContent(), true));
+        $this->assertEquals($expected, json_decode($response->getContent(), true));
     }
 
     /**