Statement::process can now handle ResultSet instances too

Author: nyamsprod

phpstan.src.neon

@@ -18,4 +18,8 @@ parameters:
           path: src/Stream.php
         - message: '#Unsafe usage of new static\(\).#'
           path: src/AbstractCsv.php
+        - message: '#Instanceof between League\\Csv\\ResultSet and League\\Csv\\ResultSet will always evaluate to true.#'
+          path: src/Statement.php
+        - message: '#Result of && is always false.#'
+          path: src/Statement.php
     reportUnmatchedIgnoredErrors: false

phpstan.tests.neon

@@ -9,5 +9,8 @@ parameters:
           path: tests/DetectDelimiterTest.php
         - message: '#Parameter \#1 \$document of static method League\\Csv\\Polyfill\\EmptyEscapeParser::parse\(\) expects League\\Csv\\Stream\|SplFileObject, stdClass given.#'
           path: tests/Polyfill/EmptyEscapeParserTest.php
+        - message: '#Parameter \#1 \$records of method League\\Csv\\Statement::process\(\) expects League\\Csv\\Reader\|League\\Csv\\ResultSet, stdClass given.#'
+          path: tests/ResultSetTest.php
+
     reportUnmatchedIgnoredErrors: true
     checkMissingIterableValueType: false

src/Statement.php

@@ -17,8 +17,8 @@
 use CallbackFilterIterator;
 use Iterator;
 use LimitIterator;
+use TypeError;
 use function array_reduce;
-use function iterator_to_array;
 
 /**
  * Criteria to filter a {@link Reader} object.
@@ -135,20 +135,63 @@ public function limit(int $limit): self
     /**
      * Execute the prepared Statement on the {@link Reader} object.
      *
-     * @param string[] $header an optional header to use instead of the CSV document header
+     * @param Reader|ResultSet $records
+     * @param string[]         $header  an optional header to use instead of the CSV document header
      */
-    public function process(Reader $csv, array $header = []): ResultSet
+    public function process($records, array $header = []): ResultSet
     {
+        if (!($records instanceof Reader) && !($records instanceof ResultSet)) {
+            throw new TypeError(sprintf(
+                '%s::parse expects parameter 1 to be a %s or a %s object, %s given',
+                Statement::class,
+                ResultSet::class,
+                Reader::class,
+                get_class($records)
+            ));
+        }
+
         if ([] === $header) {
-            $header = $csv->getHeader();
+            $header = $records->getHeader();
         }
 
-        $iterator = array_reduce($this->where, [$this, 'filter'], $csv->getRecords($header));
+        $iterator = $this->combineHeader($records, $header);
+        $iterator = array_reduce($this->where, [$this, 'filter'], $iterator);
         $iterator = $this->buildOrderBy($iterator);
 
         return new ResultSet(new LimitIterator($iterator, $this->offset, $this->limit), $header);
     }
 
+    /**
+     * Combine the CSV header to each record if present.
+     *
+     * @param Reader|ResultSet $iterator
+     * @param string[]         $header
+     */
+    protected function combineHeader($iterator, array $header): Iterator
+    {
+        if ($iterator instanceof Reader) {
+            return $iterator->getRecords($header);
+        }
+
+        if ($header === $iterator->getHeader()) {
+            return $iterator->getRecords();
+        }
+
+        $field_count = count($header);
+        $mapper = static function (array $record) use ($header, $field_count): array {
+            if (count($record) != $field_count) {
+                $record = array_slice(array_pad($record, $field_count, null), 0, $field_count);
+            }
+
+            /** @var array<string|null> $assocRecord */
+            $assocRecord = array_combine($header, $record);
+
+            return $assocRecord;
+        };
+
+        return new MapIterator($iterator, $mapper);
+    }
+
     /**
      * Filters elements of an Iterator using a callback function.
      */
@@ -176,9 +219,12 @@ protected function buildOrderBy(Iterator $iterator): Iterator
             return $cmp ?? 0;
         };
 
-        $iterator = new ArrayIterator(iterator_to_array($iterator));
-        $iterator->uasort($compare);
+        $it = new ArrayIterator();
+        foreach ($iterator as $offset => $value) {
+            $it[$offset] = $value;
+        }
+        $it->uasort($compare);
 
-        return $iterator;
+        return $it;
     }
 }

tests/ResultSetTest.php

@@ -19,6 +19,8 @@
 use OutOfBoundsException;
 use PHPUnit\Framework\TestCase;
 use SplTempFileObject;
+use stdClass;
+use TypeError;
 use function array_reverse;
 use function current;
 use function in_array;
@@ -113,6 +115,13 @@ public function testStatementSameInstance(): void
         self::assertSame($stmt_alt, $this->stmt);
     }
 
+    public function testProcessThrowsOnUnsupportedFormat(): void
+    {
+        self::expectException(TypeError::class);
+        $stmt = Statement::create();
+        $stmt->process(new stdClass());
+    }
+
     /**
      * @covers League\Csv\Statement::limit
      */
@@ -183,17 +192,32 @@ public function testIntervalThrowException(): void
     /**
      * @covers League\Csv\Statement::where
      * @covers League\Csv\Statement::create
+     * @covers League\Csv\Statement::process
+     * @covers League\Csv\Statement::combineHeader
      */
     public function testFilter(): void
     {
-        $func = function ($row) {
+        $func1 = function ($row) {
             return !in_array('jane', $row, true);
         };
 
+        $func2 = function ($row) {
+            return !in_array('john', $row, true);
+        };
+
+        $stmt = Statement::create($func1);
+        $result1 = $stmt->process($this->csv);
+
+        $result2 = $stmt->where($func2)->process($result1, ['foo', 'bar']);
+        $result3 = $stmt->where($func2)->process($result2, ['foo', 'bar']);
+
         self::assertNotContains(
             ['jane', 'doe', '[email protected]'],
-            iterator_to_array(Statement::create($func)->process($this->csv), false)
+            iterator_to_array($result1, false)
         );
+
+        self::assertCount(0, $result2);
+        self::assertEquals($result3, $result2);
     }
 
     /**