Remove deprecated newline parameters from CreateFromString

11 files changed, 32 insertions, 39 deletions

diff --git a/test/AbstractTestCase.php b/test/AbstractTestCase.php
index a8280b7..9466650 100644
--- a/test/AbstractTestCase.php
+++ b/test/AbstractTestCase.php
@@ -4,9 +4,6 @@ namespace League\Csv\Test;
 
 use PHPUnit_Framework_TestCase;
 
-/**
- * @group controls
- */
 class AbstractTestCase extends PHPUnit_Framework_TestCase
 {
     protected function checkRequirements()
diff --git a/test/ControlsTest.php b/test/ControlsTest.php
index 35f6fe8..4635ae8 100644
--- a/test/ControlsTest.php
+++ b/test/ControlsTest.php
@@ -1,19 +1,16 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
-date_default_timezone_set('UTC');
-
 /**
  * @group controls
  */
-class ControlsTest extends PHPUnit_Framework_TestCase
+class ControlsTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
index 377b1b9..f696176 100644
--- a/test/FactoryTest.php
+++ b/test/FactoryTest.php
@@ -2,6 +2,7 @@
 
 namespace League\Csv\Test;
 
+use ArrayIterator;
 use League\Csv\Reader;
 use SplFileInfo;
 use SplFileObject;
@@ -14,21 +15,21 @@ class FactoryTest extends AbstractTestCase
 {
     public function testCreateFromPathWithFilePath()
     {
-        $path = __DIR__.'/foo.csv';
+        $path = __DIR__.'/data/foo.csv';
         $csv  = Reader::createFromPath($path);
         $this->assertSame($path, $csv->getIterator()->getRealPath());
     }
 
     public function testCreateFromPathWithSplFileInfo()
     {
-        $path = __DIR__.'/foo.csv';
+        $path = __DIR__.'/data/foo.csv';
         $csv  = Reader::createFromPath(new SplFileInfo($path));
         $this->assertSame($path, $csv->getIterator()->getRealPath());
     }
 
     public function testCreateFromPathWithPHPWrapper()
     {
-        $path = __DIR__.'/foo.csv';
+        $path = __DIR__.'/data/foo.csv';
         $csv = Reader::createFromPath('php://filter/read=string.toupper/resource='.$path);
         $this->assertFalse($csv->getIterator()->getRealPath());
     }
@@ -41,6 +42,14 @@ class FactoryTest extends AbstractTestCase
         Reader::createFromPath(new SplTempFileObject());
     }
 
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testCreateFromPathWithInvalidObject()
+    {
+        Reader::createFromPath(new ArrayIterator([]));
+    }
+
     public function testCreateFromString()
     {
         $expected = 'john,doe,john.doe@example.com'.PHP_EOL
@@ -58,7 +67,7 @@ class FactoryTest extends AbstractTestCase
 
     public function testCreateFromFileObjectWithSplFileObject()
     {
-        $path   = __DIR__.'/foo.csv';
+        $path   = __DIR__.'/data/foo.csv';
         $obj    = new SplFileObject($path);
         $reader = Reader::createFromFileObject($obj);
         $this->assertInstanceof('League\Csv\Reader', $reader);
diff --git a/test/Plugin/ColumnConsistencyValidatorTest.php b/test/Plugin/ColumnConsistencyValidatorTest.php
index 43f023a..e49e770 100644
--- a/test/Plugin/ColumnConsistencyValidatorTest.php
+++ b/test/Plugin/ColumnConsistencyValidatorTest.php
@@ -22,7 +22,7 @@ class ColumnConsistencyValidatorTest extends AbstractTestCase
 
     public function tearDown()
     {
-        $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w');
+        $csv = new SplFileObject(dirname(__DIR__).'/data/foo.csv', 'w');
         $csv->setCsvControl();
         $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"');
         $this->csv = null;
diff --git a/test/Plugin/NullValidatorTest.php b/test/Plugin/NullValidatorTest.php
index 6e351ce..c4114ad 100644
--- a/test/Plugin/NullValidatorTest.php
+++ b/test/Plugin/NullValidatorTest.php
@@ -23,7 +23,7 @@ class NullValidatorTest extends AbstractTestCase
 
     public function tearDown()
     {
-        $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w');
+        $csv = new SplFileObject(dirname(__DIR__).'/data/foo.csv', 'w');
         $csv->setCsvControl();
         $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"');
         $this->csv = null;
diff --git a/test/Plugin/SkipNullValuesFormatterTest.php b/test/Plugin/SkipNullValuesFormatterTest.php
index 8f203da..3e0787e 100644
--- a/test/Plugin/SkipNullValuesFormatterTest.php
+++ b/test/Plugin/SkipNullValuesFormatterTest.php
@@ -23,7 +23,7 @@ class SkipNullValuesFormatterTest extends AbstractTestCase
 
     public function tearDown()
     {
-        $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w');
+        $csv = new SplFileObject(dirname(__DIR__).'/data/foo.csv', 'w');
         $csv->setCsvControl();
         $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"');
         $this->csv = null;
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 4535dce..4ff96dc 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplTempFileObject;
 
 /**
  * @group reader
  */
-class ReaderTest extends PHPUnit_Framework_TestCase
+class ReaderTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/StreamFilterTest.php b/test/StreamFilterTest.php
index 7bb8a7b..fe81c48 100644
--- a/test/StreamFilterTest.php
+++ b/test/StreamFilterTest.php
@@ -15,7 +15,7 @@ class StreamFilterTest extends AbstractTestCase
 {
     public function testInitStreamFilterWithWriterStream()
     {
-        $filter = 'php://filter/write=string.rot13/resource='.__DIR__.'/foo.csv';
+        $filter = 'php://filter/write=string.rot13/resource='.__DIR__.'/data/foo.csv';
         $csv = Reader::createFromPath($filter);
         $this->assertTrue($csv->hasStreamFilter('string.rot13'));
         $this->assertSame(STREAM_FILTER_WRITE, $csv->getStreamFilterMode());
@@ -23,7 +23,7 @@ class StreamFilterTest extends AbstractTestCase
 
     public function testInitStreamFilterWithReaderStream()
     {
-        $filter = 'php://filter/read=string.toupper/resource='.__DIR__.'/foo.csv';
+        $filter = 'php://filter/read=string.toupper/resource='.__DIR__.'/data/foo.csv';
         $csv = Reader::createFromPath($filter);
         $this->assertTrue($csv->hasStreamFilter('string.toupper'));
         $this->assertSame(STREAM_FILTER_READ, $csv->getStreamFilterMode());
@@ -31,7 +31,7 @@ class StreamFilterTest extends AbstractTestCase
 
     public function testInitStreamFilterWithBothStream()
     {
-        $filter = 'php://filter/string.toupper/resource='.__DIR__.'/foo.csv';
+        $filter = 'php://filter/string.toupper/resource='.__DIR__.'/data/foo.csv';
         $csv = Reader::createFromPath($filter);
         $this->assertTrue($csv->hasStreamFilter('string.toupper'));
         $this->assertSame(STREAM_FILTER_ALL, $csv->getStreamFilterMode());
@@ -42,12 +42,12 @@ class StreamFilterTest extends AbstractTestCase
      */
     public function testInitStreamFilterWithSplFileObject()
     {
-        Reader::createFromFileObject(new SplFileObject(__DIR__.'/foo.csv'))->getStreamFilterMode();
+        Reader::createFromFileObject(new SplFileObject(__DIR__.'/data/foo.csv'))->getStreamFilterMode();
     }
 
     public function testappendStreamFilter()
     {
-        $csv = Reader::createFromPath(__DIR__.'/foo.csv');
+        $csv = Reader::createFromPath(__DIR__.'/data/foo.csv');
         $csv->appendStreamFilter('string.toupper');
         foreach ($csv->getIterator() as $row) {
             $this->assertSame($row, ['JOHN', 'DOE', 'JOHN.DOE@EXAMPLE.COM']);
@@ -79,7 +79,7 @@ class StreamFilterTest extends AbstractTestCase
      */
     public function testaddMultipleStreamFilter()
     {
-        $csv = Reader::createFromPath(__DIR__.'/foo.csv');
+        $csv = Reader::createFromPath(__DIR__.'/data/foo.csv');
         $csv->appendStreamFilter('string.tolower');
         $csv->prependStreamFilter('string.rot13');
         $csv->appendStreamFilter('string.toupper');
@@ -105,7 +105,7 @@ class StreamFilterTest extends AbstractTestCase
 
     public function testGetFilterPath()
     {
-        $csv = Writer::createFromPath(__DIR__.'/foo.csv');
+        $csv = Writer::createFromPath(__DIR__.'/data/foo.csv');
         $csv->appendStreamFilter('string.rot13');
         $csv->prependStreamFilter('string.toupper');
         $this->assertFalse($csv->getIterator()->getRealPath());
@@ -113,7 +113,7 @@ class StreamFilterTest extends AbstractTestCase
 
     public function testGetFilterPathWithAllStream()
     {
-        $filter = 'php://filter/string.toupper/resource='.__DIR__.'/foo.csv';
+        $filter = 'php://filter/string.toupper/resource='.__DIR__.'/data/foo.csv';
         $csv = Reader::createFromPath($filter);
         $this->assertFalse($csv->getIterator()->getRealPath());
     }
@@ -121,7 +121,7 @@ class StreamFilterTest extends AbstractTestCase
     public function testSetStreamFilterWriterNewLine()
     {
         stream_filter_register(FilterReplace::FILTER_NAME.'*', '\lib\FilterReplace');
-        $csv = Writer::createFromPath(__DIR__.'/newline.csv');
+        $csv = Writer::createFromPath(__DIR__.'/data/newline.csv');
         $csv->appendStreamFilter(FilterReplace::FILTER_NAME."\r\n:\n");
         $this->assertTrue($csv->hasStreamFilter(FilterReplace::FILTER_NAME."\r\n:\n"));
         $csv->insertOne([1, 'two', 3, "new\r\nline"]);
diff --git a/test/WriterTest.php b/test/WriterTest.php
index 7ba1ef4..d21a9a6 100644
--- a/test/WriterTest.php
+++ b/test/WriterTest.php
@@ -21,7 +21,7 @@ class WriterTest extends AbstractTestCase
 
     public function tearDown()
     {
-        $csv = new SplFileObject(__DIR__.'/foo.csv', 'w');
+        $csv = new SplFileObject(__DIR__.'/data/foo.csv', 'w');
         $csv->setCsvControl();
         $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"');
         $this->csv = null;
@@ -29,7 +29,7 @@ class WriterTest extends AbstractTestCase
 
     public function testSupportsStreamFilter()
     {
-        $csv = Writer::createFromPath(__DIR__.'/foo.csv');
+        $csv = Writer::createFromPath(__DIR__.'/data/foo.csv');
         $this->assertTrue($csv->isActiveStreamFilter());
         $csv->appendStreamFilter('string.toupper');
         $csv->insertOne(['jane', 'doe', 'jane@example.com']);
@@ -51,7 +51,7 @@ class WriterTest extends AbstractTestCase
 
     public function testInsertNormalFile()
     {
-        $csv = Writer::createFromPath(__DIR__.'/foo.csv', 'a+');
+        $csv = Writer::createFromPath(__DIR__.'/data/foo.csv', 'a+');
         $csv->insertOne(['jane', 'doe', 'jane.doe@example.com']);
         $this->assertContains(['jane', 'doe', 'jane.doe@example.com'], $csv);
     }
@@ -112,15 +112,6 @@ class WriterTest extends AbstractTestCase
         $this->assertSame("jane,doe\r\n", (string) $csv);
     }
 
-    public function testCustomNewlineFromCreateFromString()
-    {
-        $expected = "\r\n";
-        $raw = 'john,doe,john.doe@example.com'.PHP_EOL
-            .'jane,doe,jane.doe@example.com'.PHP_EOL;
-        $csv = Writer::createFromString($raw, $expected);
-        $this->assertSame($expected, $csv->getNewline());
-    }
-
     public function testAddValidationRules()
     {
         $func = function (array $row) {
diff --git a/test/foo.csv b/test/data/foo.csv
index 2f6d89f..2f6d89f 100644
--- a/test/foo.csv
+++ b/test/data/foo.csv
diff --git a/test/newline.csv b/test/data/newline.csv
index a9da13c..a9da13c 100644
--- a/test/newline.csv
+++ b/test/data/newline.csv