remove Bakame iterator2array implementation

thephpleague · Feb 14, 2014 · 837f729 · 837f729
1 parent 061a4d2
commit 837f729
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 73 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
         "ext-mbstring" : "*"
     },
     "autoload": {
-        "files": ["src/Bakame/Csv/Iterator/functions.php"],
         "psr-0": {
             "Bakame": ["src", "test"]
         }

diff --git a/src/Bakame/Csv/AbstractCsv.php b/src/Bakame/Csv/AbstractCsv.php
@@ -403,14 +403,14 @@ public function jsonSerialize()
         if ('UTF-8' != $this->encoding) {
             $iterator = new MapIterator($iterator, function ($row) {
                 foreach ($row as &$value) {
-                    $value =  mb_convert_encoding($value, 'UTF-8', $this->encoding);
+                    $value = mb_convert_encoding($value, 'UTF-8', $this->encoding);
                 }
                 unset($value);
 
                 return $row;
             });
         }
 
-        return \Bakame\Csv\Iterator\iterator2Array($iterator, false);
+        return iterator_to_array($iterator, false);
     }
 }
diff --git a/src/Bakame/Csv/Iterator/functions.php b/src/Bakame/Csv/Iterator/functions.php
diff --git a/src/Bakame/Csv/Reader.php b/src/Bakame/Csv/Reader.php
@@ -129,7 +129,7 @@ public function fetchAll(callable $callable = null)
     {
         $iterator = $this->query($callable);
 
-        return \Bakame\Csv\Iterator\iterator2Array($iterator, false);
+        return iterator_to_array($iterator, false);
     }
 
     /**
@@ -159,7 +159,7 @@ public function fetchAssoc(array $keys, callable $callable = null)
             return self::combineArray($keys, $row);
         });
 
-        return \Bakame\Csv\Iterator\iterator2Array($iterator, false);
+        return iterator_to_array($iterator, false);
     }
 
     /**
@@ -189,7 +189,7 @@ public function fetchCol($columnIndex, callable $callable = null)
             return $row[$columnIndex];
         });
 
-        return \Bakame\Csv\Iterator\iterator2Array($iterator, false);
+        return iterator_to_array($iterator, false);
     }
 
     /**

diff --git a/test/Bakame/Csv/CsvTest.php b/test/Bakame/Csv/CsvTest.php
@@ -186,11 +186,4 @@ public static function getIso8859Csv()
     {
         return [[file_get_contents(__DIR__.'/data/prenoms.csv')]];
     }
-
-    public function testIterator2Array()
-    {
-        $res = \Bakame\Csv\Iterator\iterator2Array($this->csv);
-        $res2 = \Bakame\Csv\Iterator\iterator2Array($this->csv, false);
-        $this->assertSame($res, $res2);
-    }
 }