Fixed bug where any response object that could not be type cast as a string would throw an exception. Fixes dingo#277.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

changes.md

@@ -4,6 +4,10 @@
 
 - Default throttles for rate limiting have been removed.
 
+#### Fixed
+
+- Fixed bug where any response object that could not be type cast as a string would throw an `UnexpectedValueException`.
+
 ### v0.7.2
 
 #### Fixed

src/Http/Response.php

@@ -3,6 +3,7 @@
 namespace Dingo\Api\Http;
 
 use ArrayObject;
+use UnexpectedValueException;
 use Dingo\Api\Transformer\TransformerFactory;
 use Illuminate\Http\Response as IlluminateResponse;
 use Illuminate\Support\Contracts\ArrayableInterface;
@@ -72,6 +73,24 @@ public function morph($format = 'json')
         return $this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function setContent($content)
+    {
+        // Attempt to set the content string, if we encounter an unexpected value
+        // then we most likely have an object that cannot be type cast. In that
+        // case we'll simply leave the content as null and set the original
+        // content value the continue.
+        try {
+            return parent::setContent($content);
+        } catch (UnexpectedValueException $exception) {
+            $this->original = $content;
+
+            return $this;
+        }
+    }
+
     /**
      * Get the formatter based on the requested format type.
      *

tests/Http/ResponseTest.php

@@ -2,6 +2,7 @@
 
 namespace Dingo\Api\Tests\Http;
 
+use stdClass;
 use Dingo\Api\Http\Response;
 use PHPUnit_Framework_TestCase;
 
@@ -15,4 +16,16 @@ public function testGettingInvalidFormatterThrowsException()
     {
         Response::getFormatter('json');
     }
+
+
+    public function testNonCastableObjectsSetAsOriginalContent()
+    {
+        $object = new stdClass;
+        $object->id = 'test';
+
+        $response = new Response($object);
+
+        $this->assertNull($response->getContent());
+        $this->assertSame($object, $response->getOriginalContent());
+    }
 }