Merge 00b6e72 into 5759030

thephpleague · Dec 14, 2019 · ffbfb1f · ffbfb1f
2 parents 5759030 + 00b6e72
commit ffbfb1f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/src/functions.php b/src/functions.php
@@ -23,6 +23,7 @@
     use function is_array;
     use function iterator_to_array;
     use function rsort;
+    use function strlen;
     use function strpos;
     use const COUNT_RECURSIVE;
 
@@ -62,22 +63,37 @@ function bom_match(string $str): string
      */
     function delimiter_detect(Reader $csv, array $delimiters, int $limit = 1): array
     {
-        $found = array_unique(array_filter($delimiters, static function (string $value): bool {
-            return 1 == strlen($value);
-        }));
-        $stmt = (new Statement())->limit($limit)->where(static function (array $record): bool {
+        $filterDelimiter = static function (string $value): bool {
+            return 1 === strlen($value);
+        };
+
+        $nonEmptyRecordFilter = static function (array $record): bool {
             return count($record) > 1;
-        });
-        $reducer = static function (array $result, string $delimiter) use ($csv, $stmt): array {
-            $result[$delimiter] = count(iterator_to_array($stmt->process($csv->setDelimiter($delimiter)), false), COUNT_RECURSIVE);
+        };
+
+        $stmt = (new Statement())->limit($limit);
+
+        $uniqueDelimiters = array_unique(array_filter($delimiters, $filterDelimiter));
+
+        $reducer = static function (array $result, string $delimiter) use ($csv, $stmt, $nonEmptyRecordFilter): array {
+            $csv->setDelimiter($delimiter);
+            $resultSet = $stmt->process($csv);
+            $arr = iterator_to_array($resultSet, false);
+            $res = array_filter($arr, $nonEmptyRecordFilter);
+
+            $result[$delimiter] = count($res, COUNT_RECURSIVE);
 
             return $result;
         };
-        $delimiter = $csv->getDelimiter();
-        $header_offset = $csv->getHeaderOffset();
+
+        $current_delimiter = $csv->getDelimiter();
+        $current_header_offset = $csv->getHeaderOffset();
         $csv->setHeaderOffset(null);
-        $stats = array_reduce($found, $reducer, array_fill_keys($delimiters, 0));
-        $csv->setHeaderOffset($header_offset)->setDelimiter($delimiter);
+
+        $stats = array_reduce($uniqueDelimiters, $reducer, array_fill_keys($delimiters, 0));
+
+        $csv->setHeaderOffset($current_header_offset);
+        $csv->setDelimiter($current_delimiter);
 
         return $stats;
     }

diff --git a/tests/DetectDelimiterTest.php b/tests/DetectDelimiterTest.php
@@ -80,4 +80,16 @@ public function testDetectDelimiterKeepOriginalDelimiter()
         $res = delimiter_detect($csv, ['toto', '|'], 5);
         self::assertSame('@', $csv->getDelimiter());
     }
+
+    public function testExpectedLimitIsUsedIssue366()
+    {
+        $text = <<<EOF
+foo;bar;hello_world
+42;1,2,3,4,5;true
+EOF;
+        $expected = [';' => 4, ',' => 0];
+        $reader = Reader::createFromString($text);
+        $result = delimiter_detect($reader, [';', ','], 1);
+        self::assertSame($expected, $result);
+    }
 }