return path in export method (issue #20)

rap2hpoutre · May 7, 2018 · 83b2d15 · 83b2d15
1 parent 74efc43
commit 83b2d15
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Exportable.php b/src/Exportable.php
@@ -28,9 +28,9 @@ abstract protected function getType($path);
     abstract protected function setOptions(&$reader_or_writer);
 
     /**
-     * @param string        $path
+     * @param string $path
      * @param callable|null $callback
-     *
+     * @return string
      * @throws \Box\Spout\Common\Exception\IOException
      * @throws \Box\Spout\Common\Exception\InvalidArgumentException
      * @throws \Box\Spout\Common\Exception\UnsupportedTypeException
@@ -39,6 +39,7 @@ abstract protected function setOptions(&$reader_or_writer);
     public function export($path, callable $callback = null)
     {
         self::exportOrDownload($path, 'openToFile', $callback);
+        return realpath($path) ?: $path;
     }
 
     /**

diff --git a/tests/FastExcelTest.php b/tests/FastExcelTest.php
@@ -165,4 +165,19 @@ public function testIssue18()
         $collection = (new FastExcel)->import(__DIR__ . '/test18.csv');
         $this->assertInstanceOf(Collection::class, $collection);
     }
+
+    /**
+     * @throws \Box\Spout\Common\Exception\IOException
+     * @throws \Box\Spout\Common\Exception\InvalidArgumentException
+     * @throws \Box\Spout\Common\Exception\UnsupportedTypeException
+     * @throws \Box\Spout\Reader\Exception\ReaderNotOpenedException
+     * @throws \Box\Spout\Writer\Exception\WriterNotOpenedException
+     */
+    public function testIssue20()
+    {
+        chdir(__DIR__);
+        $path = (new FastExcel($this->collection()))->export('test2.xlsx');
+        $this->assertEquals(__DIR__ . '/test2.xlsx', $path);
+        unlink($path);
+    }
 }