let's be nice with scrutinizr

5 files changed, 18 insertions, 7 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 967e2b6..4f6765c 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -153,9 +153,11 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     }
 
     /**
-     * {@inheritdoc}
+     * Return the Iterator for conversion
+     *
+     * @return \Iterator
      */
-    protected function getOutputIterator()
+    protected function getConvertionIterator()
     {
         return $this->getIterator();
     }
diff --git a/src/Config/Factory.php b/src/Config/Factory.php
index ecc39ac..4a10481 100644
--- a/src/Config/Factory.php
+++ b/src/Config/Factory.php
@@ -109,4 +109,13 @@ trait Factory
 
         return $obj;
     }
+
+    /**
+     * set the newline sequence characters
+     *
+     * @param string $newline
+     *
+     * @return static
+     */
+    abstract public function setNewline($newline);
 }
diff --git a/src/Config/Output.php b/src/Config/Output.php
index 89761b7..f6af901 100644
--- a/src/Config/Output.php
+++ b/src/Config/Output.php
@@ -51,7 +51,7 @@ trait Output
      *
      * @return \Iterator
      */
-    abstract protected function getOutputIterator();
+    abstract protected function getConvertionIterator();
 
     /**
      * Return the CSV Iterator
@@ -215,7 +215,7 @@ trait Output
      */
     public function jsonSerialize()
     {
-        return iterator_to_array($this->convertToUtf8($this->getOutputIterator()), false);
+        return iterator_to_array($this->convertToUtf8($this->getConvertionIterator()), false);
     }
 
     /**
@@ -267,7 +267,7 @@ trait Output
     {
         $doc = new DomDocument('1.0', 'UTF-8');
         $root = $doc->createElement($root_name);
-        $iterator = $this->convertToUtf8($this->getOutputIterator());
+        $iterator = $this->convertToUtf8($this->getConvertionIterator());
         foreach ($iterator as $row) {
             $item = $doc->createElement($row_name);
             array_walk($row, function ($value) use (&$item, $doc, $cell_name) {
diff --git a/src/Iterators/MapIterator.php b/src/Iterators/MapIterator.php
index 6cbdfe8..9f91448 100644
--- a/src/Iterators/MapIterator.php
+++ b/src/Iterators/MapIterator.php
@@ -52,6 +52,6 @@ class MapIterator extends IteratorIterator
         $iterator = $this->getInnerIterator();
         $callable = $this->callable;
 
-        return $callable(parent::current(), parent::key(), $iterator);
+        return $callable($iterator->current(), $iterator->key(), $iterator);
     }
 }
diff --git a/src/Reader.php b/src/Reader.php
index cab1176..d956eee 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -63,7 +63,7 @@ class Reader extends AbstractCsv
     /**
      * {@inheritdoc}
      */
-    protected function getOutputIterator()
+    protected function getConvertionIterator()
     {
         $iterator = $this->getIterator();
         $iterator = $this->applyIteratorFilter($iterator);