Merge pull request #19 from countless-integers/patch-1

fixes behaviour for passing empty values to parseIncludes
spatie · Dec 16, 2015 · 189c6b4 · 189c6b4
2 parents 5bde517 + 8d91785
commit 189c6b4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Fractal.php b/src/Fractal.php
@@ -160,7 +160,7 @@ public function parseIncludes($includes)
             },  explode(',', $includes));
         }
 
-        $this->includes = array_merge($this->includes, $includes);
+        $this->includes = array_merge($this->includes, (array)$includes);
 
         return $this;
     }

diff --git a/tests/Integration/IncludesTest.php b/tests/Integration/IncludesTest.php
@@ -82,4 +82,28 @@ public function it_can_handle_multiple_includes_at_once()
 
         $this->assertEquals($expectedArray, $array);
     }
+
+    /**
+     * @test
+     */
+    public function it_knows_to_ignore_invalid_includes_param()
+    {
+        $array = $this->fractal
+            ->collection($this->testBooks, new TestTransformer())
+            ->parseIncludes(null)
+            ->toArray();
+
+        $expectedArray = ['data' => [
+            ['id' => 1, 'author' => 'Philip K Dick', ],
+            ['id' => 2, 'author' => 'George R. R. Satan', ],
+        ]];
+
+        $this->assertEquals($expectedArray, $array);
+
+        $array = $this->fractal
+            ->collection($this->testBooks, new TestTransformer())
+            ->parseIncludes([])
+            ->toArray();
+        $this->assertEquals($expectedArray, $array);
+    }
 }