Return an encoded empty array when formatting empty Eloquent collection. Fixes dingo#4.

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

Author: jasonlewis

src/Http/ResponseFormat/JsonResponseFormat.php

@@ -25,6 +25,11 @@ public function formatEloquentModel($model)
 	 */
 	public function formatEloquentCollection($collection)
 	{
+		if ($collection->isEmpty())
+		{
+			return $this->encode([]);
+		}
+
 		$key = str_plural($collection->first()->getTable());
 
 		return $this->encode([$key => $collection->toArray()]);

tests/HttpResponseFormatJsonResponseFormatTest.php

@@ -37,6 +37,14 @@ public function testMorphingEloquentCollection()
 	}
 
 
+	public function testMorphingEmptyEloquentCollection()
+	{
+		$response = with(new Response(new EmptyEloquentCollectionStub))->morph();
+
+		$this->assertEquals('[]', $response->getContent());
+	}
+
+
 	public function testMorphingJsonableInterface()
 	{
 		$response = with(new Response(new JsonableStub))->morph();

tests/stubs.php

@@ -12,6 +12,7 @@ public function toArray()
 
 }
 
+
 class EloquentCollectionStub extends Illuminate\Database\Eloquent\Collection {
 
 	public function __construct()
@@ -24,6 +25,12 @@ public function __construct()
 
 }
 
+
+class EmptyEloquentCollectionStub extends Illuminate\Database\Eloquent\Collection {
+
+}
+
+
 class JsonableStub implements Illuminate\Support\Contracts\JsonableInterface {
 
 	public function toJson($options = 0)