Merge branch 'hotfix/20'

Close #20

Author: weierophinney

CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions 0.3.0 and prior were released as "weierophinney/problem-details".
 
+## 0.5.1 - 2017-12-07
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#20](https://github.com/zendframework/zend-problem-details/pull/20) fixes an
+  issue with serialization when PHP resources are within the `$additional`
+  aspect of the payload. When these values are encountered, the response factory
+  now will instead return `Resource of type {resource type}`.
+
 ## 0.5.0 - 2017-10-09
 
 ### Added

src/ProblemDetailsResponseFactory.php

@@ -229,6 +229,12 @@ public function createResponse(
         ];
 
         if ($additional) {
+            // ensure payload can be json_encoded
+            array_walk_recursive($additional, function (&$value) {
+                if (is_resource($value)) {
+                    $value = print_r($value, true) . ' of type ' . get_resource_type($value);
+                }
+            });
             $payload = array_merge($additional, $payload);
         }
 

test/ProblemDetailsResponseFactoryTest.php

@@ -135,6 +135,34 @@ public function testCreateResponseFromThrowableWillPullDetailsFromProblemDetails
         $this->assertSame('bar', $payload['foo']);
     }
 
+    /**
+     * @dataProvider acceptHeaders
+     */
+    public function testCreateResponseRemovesResourcesFromInputData(string $header, string $expectedType) : void
+    {
+        $this->request->getHeaderLine('Accept')->willReturn($header);
+
+        $fh = fopen(__FILE__, 'r');
+        $response = $this->factory->createResponse(
+            $this->request->reveal(),
+            500,
+            'Unknown error occurred',
+            'Title',
+            'Type',
+            [
+                'args' => [
+                    'resource' => $fh,
+                ]
+            ]
+        );
+        fclose($fh);
+
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertEquals($expectedType, $response->getHeaderLine('Content-Type'));
+
+        $this->assertNotEmpty((string)$response->getBody(), 'Body is missing');
+    }
+
     public function testFactoryRaisesExceptionIfBodyFactoryDoesNotReturnStream() : void
     {
         $this->request->getHeaderLine('Accept')->willReturn('application/json');