Fixes type-hinting to Orchestra\Support\Contracts\CsvableInterface.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · May 20, 2014 · 8e21b1e · 8e21b1e
1 parent 373ca6a
commit 8e21b1e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,6 +5,10 @@ title: Facile Change Log
 
 ## Version 2.1 {#v2-1}
 
+### v2.1.4 {#v2-1-4}
+
+* Fixes type-hinting to `Orchestra\Support\Contracts\CsvableInterface`.
+
 ### v2.1.3 {#v2-1-3}
 
 * Replace `Orchestra\Facile\Container::on()` with `Orchestra\Facile\Container::when()`.

diff --git a/src/Facile/Template/Base.php b/src/Facile/Template/Base.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\Contracts\ArrayableInterface;
 use Illuminate\View\View;
 use Orchestra\Support\Collection;
+use Orchestra\Support\Contracts\CsvableInterface;
 
 class Base extends Driver
 {
@@ -57,6 +58,7 @@ public function composeHtml($view = null, array $data = array(), $status = 200,
     public function composeJson($view, array $data = array(), $status = 200, array $config = array())
     {
         unset($view);
+        unset($config);
 
         $data = array_map(array($this, 'transformToArray'), $data);
 

diff --git a/tests/Template/BaseTest.php b/tests/Template/BaseTest.php
@@ -86,15 +86,16 @@ public function testComposeJsonMethod()
     }
 
     /**
-     * Test Orchestra\Facile\Template::composeCsv() method.
+     * Test Orchestra\Facile\Template::composeCsv() method
+     * given as Illuminate\Support\Contracts\ArrayableInterface.
      *
      * @test
      */
-    public function testComposeCsvMethod()
+    public function testComposeCsvMethodAsArrayableInterface()
     {
         $view = m::mock('\Illuminate\View\Environment');
         $data = array(
-            'data' => new Collection(array(
+            'data' => new \Illuminate\Support\Collection(array(
                 array('id' => 1, 'name' => 'Mior Muhammad Zaki'),
                 array('id' => 2, 'name' => 'Taylor Otwell'),
             )),
@@ -105,6 +106,36 @@ public function testComposeCsvMethod()
 1,"Mior Muhammad Zaki"
 2,"Taylor Otwell"
 
+EXPECTED;
+
+        $stub = with(new Base($view))->composeCsv(null, $data);
+
+        $this->assertInstanceOf('\Illuminate\Http\Response', $stub);
+        $this->assertEquals($expected, $stub->getContent());
+        $this->assertEquals('text/csv', $stub->headers->get('content-type'));
+    }
+
+    /**
+     * Test Orchestra\Facile\Template::composeCsv() method
+     * given as Orchestra\Support\Contracts\CsvableInterface.
+     *
+     * @test
+     */
+    public function testComposeCsvMethodAsCsvableInterface()
+    {
+        $view = m::mock('\Illuminate\View\Environment');
+        $data = array(
+            'data' => new Collection(array(
+                    array('id' => 1, 'name' => 'Mior Muhammad Zaki'),
+                    array('id' => 2, 'name' => 'Taylor Otwell'),
+                )),
+        );
+
+        $expected = <<<EXPECTED
+id,name
+1,"Mior Muhammad Zaki"
+2,"Taylor Otwell"
+
 EXPECTED;
 
         $stub = with(new Base($view))->composeCsv(null, $data);