change parser name

thephpleague · Sep 24, 2018 · 7e89821 · 7e89821
1 parent 778a240
commit 7e89821
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/phpstan.tests.neon b/phpstan.tests.neon
@@ -10,5 +10,5 @@ parameters:
 		- '#Parameter \#1 \$resource of class League\\Csv\\Stream constructor expects resource, string given.#'
 		- '#Parameter \#1 \$records of method League\\Csv\\CharsetConverter::convert\(\) expects array|Traversable, string given.#'
 		- '#Parameter \#2 \$delimiters of function League\\Csv\\delimiter_detect expects array<string>, array<int, array|string> given.#'
-		- '#Parameter \#1 \$document of class League\\Csv\\RFC4180Iterator constructor expects League\\Csv\\Stream\|SplFileObject, array given.#'
+		- '#Parameter \#1 \$document of class League\\Csv\\RFC4180Parser constructor expects League\\Csv\\Stream\|SplFileObject, array given.#'
 	reportUnmatchedIgnoredErrors: false
diff --git a/src/RFC4180Iterator.php → src/RFC4180Parser.php b/src/RFC4180Iterator.php → src/RFC4180Parser.php
@@ -41,7 +41,7 @@
  *
  * @internal used internally to produce RFC4180 compliant records
  */
-final class RFC4180Iterator implements IteratorAggregate
+final class RFC4180Parser implements IteratorAggregate
 {
     /**
      * @internal

diff --git a/src/Reader.php b/src/Reader.php
@@ -170,7 +170,7 @@ protected function seekRow(int $offset)
     protected function getDocument(): Iterator
     {
         if ('' === $this->escape && PHP_VERSION_ID < 70400) {
-            return (new RFC4180Iterator($this->document, $this->delimiter, $this->enclosure))->getIterator();
+            return (new RFC4180Parser($this->document, $this->delimiter, $this->enclosure))->getIterator();
         }
 
         $this->document->setFlags(SplFileObject::READ_CSV | SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY);

diff --git a/tests/RFC4180IteratorTest.php → tests/RFC4180ParserTest.php b/tests/RFC4180IteratorTest.php → tests/RFC4180ParserTest.php
@@ -16,7 +16,7 @@
 
 use League\Csv\Exception;
 use League\Csv\Reader;
-use League\Csv\RFC4180Iterator;
+use League\Csv\RFC4180Parser;
 use League\Csv\Stream;
 use PHPUnit\Framework\TestCase;
 use SplTempFileObject;
@@ -25,17 +25,17 @@
 
 /**
  * @group reader
- * @coversDefaultClass League\Csv\RFC4180Iterator
+ * @coversDefaultClass League\Csv\RFC4180Parser
  */
-class RFC4180IteratorTest extends TestCase
+class RFC4180ParserTest extends TestCase
 {
     /**
      * @covers ::__construct
      */
     public function testConstructorThrowsTypeErrorWithUnknownDocument()
     {
         self::expectException(TypeError::class);
-        new RFC4180Iterator([]);
+        new RFC4180Parser([]);
     }
 
     /**
@@ -44,7 +44,7 @@ public function testConstructorThrowsTypeErrorWithUnknownDocument()
     public function testConstructorThrowExceptionWithInvalidDelimiter()
     {
         self::expectException(Exception::class);
-        new RFC4180Iterator(new SplTempFileObject(), 'toto');
+        new RFC4180Parser(new SplTempFileObject(), 'toto');
     }
 
     /**
@@ -53,7 +53,7 @@ public function testConstructorThrowExceptionWithInvalidDelimiter()
     public function testConstructorThrowExceptionWithInvalidEnclosure()
     {
         self::expectException(Exception::class);
-        new RFC4180Iterator(new SplTempFileObject(), ';', 'é');
+        new RFC4180Parser(new SplTempFileObject(), ';', 'é');
     }
 
     /**
@@ -78,7 +78,7 @@ public function testWorksWithMultiLines()
 MUST SELL!
 air, moon roof, loaded
 EOF;
-        $iterator = new RFC4180Iterator(Stream::createFromString($source));
+        $iterator = new RFC4180Parser(Stream::createFromString($source));
         self::assertCount(5, $iterator);
         $data = iterator_to_array($iterator->getIterator(), false);
         self::assertSame($multiline, $data[4][3]);
@@ -106,7 +106,7 @@ public function testWorksWithMultiLinesWithDifferentDelimiter()
 air| moon roof| loaded
 EOF;
         $doc = Stream::createFromString($source);
-        $iterator = new RFC4180Iterator($doc, '|', "'");
+        $iterator = new RFC4180Parser($doc, '|', "'");
         self::assertCount(5, $iterator);
         $data = iterator_to_array($iterator->getIterator(), false);
         self::assertSame($multiline, $data[4][3]);
@@ -128,7 +128,7 @@ public function testKeepEmptyLines()
 
         $rsrc = new SplTempFileObject();
         $rsrc->fwrite($source);
-        $iterator = new RFC4180Iterator($rsrc);
+        $iterator = new RFC4180Parser($rsrc);
 
         self::assertCount(4, $iterator);
         $data = iterator_to_array($iterator->getIterator(), false);
@@ -149,7 +149,7 @@ public function testTrimSpaceWithNotEncloseField()
 Year,Make,Model,,Description,   Price
   "1997,Ford,E350,"ac, abs, moon",   3000.00
 EOF;
-        $iterator = new RFC4180Iterator(Stream::createFromString($source));
+        $iterator = new RFC4180Parser(Stream::createFromString($source));
         self::assertCount(2, $iterator);
         $data = iterator_to_array($iterator->getIterator(), false);
         self::assertSame(['Year', 'Make', 'Model', '', 'Description', 'Price'], $data[0]);
@@ -165,7 +165,7 @@ public function testTrimSpaceWithNotEncloseField()
      */
     public function testHandlingInvalidCSVwithEnclosure(string $string, array $record)
     {
-        $iterator = new RFC4180Iterator(Stream::createFromString($string));
+        $iterator = new RFC4180Parser(Stream::createFromString($string));
         $data = iterator_to_array($iterator->getIterator(), false);
         self::assertSame($record, $data[0]);
     }
@@ -214,7 +214,7 @@ public function testDoubleEnclosure()
         ];
 
         $stream = Stream::createFromString($str);
-        $records = new RFC4180Iterator($stream, ';');
+        $records = new RFC4180Parser($stream, ';');
         self::assertEquals($expected, iterator_to_array($records->getIterator(), false));
     }