bug fix for HHVM

5 files changed, 22 insertions, 24 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 545e411..c2db01e 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -17,8 +17,8 @@ use DomDocument;
 use InvalidArgumentException;
 use IteratorAggregate;
 use JsonSerializable;
-use League\Csv\Config\StreamFilter;
 use League\Csv\Config\Controls;
+use League\Csv\Config\StreamFilter;
 use LimitIterator;
 use RuntimeException;
 use SplFileInfo;
@@ -214,8 +214,8 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     /**
      * Detect the CSV file delimiter
      *
-     * @param integer $nb_rows
-     * @param array   $delimiters additional delimiters
+     * @param integer  $nb_rows
+     * @param string[] $delimiters additional delimiters
      *
      * @return null|string
      *
diff --git a/src/Reader.php b/src/Reader.php
index 68ab647..3ec9f7c 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -15,10 +15,10 @@ namespace League\Csv;
 use CallbackFilterIterator;
 use InvalidArgumentException;
 use Iterator;
-use League\Csv\Iterator\MapIterator;
 use League\Csv\Iterator\Filter;
-use League\Csv\Iterator\SortBy;
 use League\Csv\Iterator\Interval;
+use League\Csv\Iterator\MapIterator;
+use League\Csv\Iterator\SortBy;
 
 /**
  *  A class to manage extracting and filtering a CSV
diff --git a/test/CsvTest.php b/test/CsvTest.php
index eaeb4a8..a455eb6 100644
--- a/test/CsvTest.php
+++ b/test/CsvTest.php
@@ -2,13 +2,13 @@
 
 namespace League\Csv\test;
 
-use SplFileInfo;
-use SplFileObject;
-use SplTempFileObject;
-use PHPUnit_Framework_TestCase;
 use DateTime;
 use League\Csv\Reader;
 use League\Csv\Writer;
+use PHPUnit_Framework_TestCase;
+use SplFileInfo;
+use SplFileObject;
+use SplTempFileObject;
 
 date_default_timezone_set('UTC');
 
@@ -64,14 +64,6 @@ class CsvTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException RuntimeException
-     */
-    public function testCreateFromPathWithNotWritablePath()
-    {
-        Reader::createFromPath('usr/bin/foo.csv')->getIterator();
-    }
-
-    /**
      * @expectedException InvalidArgumentException
      */
     public function testCreateFromPathWithSplTempFileObject()
@@ -188,6 +180,7 @@ class CsvTest extends PHPUnit_Framework_TestCase
 
     public function testIterator()
     {
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         foreach ($this->csv as $key => $row) {
             $this->assertSame($this->expected[$key], $row);
         }
@@ -221,6 +214,7 @@ class CsvTest extends PHPUnit_Framework_TestCase
 </tr>
 </table>
 EOF;
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         $this->assertSame($expected, $this->csv->toHTML());
     }
 
@@ -242,6 +236,7 @@ EOF;
 </csv>
 
 EOF;
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         $doc = $this->csv->toXML();
         $this->assertInstanceof('\DomDocument', $doc);
         $doc->formatOutput = true;
@@ -255,6 +250,7 @@ EOF;
      */
     public function testJsonInterface($rawCsv)
     {
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         $this->assertSame(json_encode($this->expected), json_encode($this->csv));
         $csv = Reader::createFromString($rawCsv);
         $csv->setEncodingFrom('iso-8859-15');
@@ -287,6 +283,7 @@ EOF;
     {
         $csv = Reader::createFromPath(__DIR__.'/foo.csv');
         $csv->appendStreamFilter('string.toupper');
+        $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         foreach ($csv->getIterator() as $row) {
             $this->assertSame($row, ['JOHN', 'DOE', 'JOHN.DOE@EXAMPLE.COM']);
         }
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 5dbf774..3118427 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -2,9 +2,10 @@
 
 namespace League\Csv\test;
 
+use League\Csv\Reader;
 use PHPUnit_Framework_TestCase;
+use SplFileObject;
 use SplTempFileObject;
-use League\Csv\Reader;
 
 /**
  * @group reader
@@ -271,6 +272,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase
 </tr>
 </table>
 EOF;
+        $writer->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         $this->assertSame($expected, $writer->toHTML());
     }
 
diff --git a/test/WriterTest.php b/test/WriterTest.php
index 1669680..1be9075 100644
--- a/test/WriterTest.php
+++ b/test/WriterTest.php
@@ -3,15 +3,13 @@
 namespace League\Csv\test;
 
 use ArrayIterator;
+use DateTime;
+use League\Csv\Writer;
 use LimitIterator;
+use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
-use DateTime;
-
-use PHPUnit_Framework_TestCase;
-use League\Csv\Writer;
-
 date_default_timezone_set('UTC');
 
 /**
@@ -43,7 +41,7 @@ class WriterTest extends PHPUnit_Framework_TestCase
         foreach ($expected as $row) {
             $this->csv->insertOne($row);
         }
-
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         foreach ($this->csv as $row) {
             $this->assertSame(['john', 'doe', 'john.doe@example.com'], $row);
         }
@@ -171,6 +169,7 @@ class WriterTest extends PHPUnit_Framework_TestCase
         ];
         $this->csv->insertAll($multipleArray);
         $this->csv->insertAll(new ArrayIterator($multipleArray));
+        $this->csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
         foreach ($this->csv as $key => $row) {
             $expected = ['jane', 'doe', 'jane.doe@example.com'];
             if ($key%2 == 0) {