Prepare interfaces for lazy result sets

Author: curry684

composer.json

@@ -2,7 +2,7 @@
     "name": "omines/datatables-bundle",
     "type": "symfony-bundle",
     "description": "Symfony DataTables Bundle",
-    "keywords": ["symfony","jquery","datatable", "datatables", "bundle"],
+    "keywords": ["symfony","jquery","datatable", "datatables", "bundle", "doctrine", "orm"],
     "license": "MIT",
     "authors": [
         {

src/Adapter/ArrayAdapter.php

@@ -14,6 +14,7 @@
 
 use Omines\DataTablesBundle\DataTableState;
 use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
  * ArrayAdapter.
@@ -25,12 +26,16 @@ class ArrayAdapter implements AdapterInterface
     /** @var array */
     private $data = [];
 
+    /** @var PropertyAccessor */
+    private $accessor;
+
     /**
      * {@inheritdoc}
      */
     public function configure(array $options)
     {
         $this->data = $options;
+        $this->accessor = PropertyAccess::createPropertyAccessor();
     }
 
     /**
@@ -65,26 +70,37 @@ public function getData(DataTableState $state): ResultSetInterface
     protected function processData(DataTableState $state, array $data, array $map)
     {
         $transformer = $state->getDataTable()->getTransformer();
-        $search = $state->getGlobalSearch() ?: null;
-        $accessor = PropertyAccess::createPropertyAccessor();
+        $search = $state->getGlobalSearch() ?: '';
         foreach ($data as $result) {
-            $row = [];
-            $match = (null === $search);
-            foreach ($state->getDataTable()->getColumns() as $column) {
-                $value = (!empty($propertyPath = $map[$column->getName()]) && $accessor->isReadable($result, $propertyPath)) ? $accessor->getValue($result, $propertyPath) : null;
-                $value = $column->transform($value, $result);
-                if (!$match) {
-                    $match = (false !== mb_stripos($value, $search));
+            if ($row = $this->processRow($state, $result, $map, $search)) {
+                if ($transformer) {
+                    $row = call_user_func($transformer, $row, $result);
                 }
-                $row[$column->getName()] = $column->transform($value, $result);
+                yield $row;
             }
+        }
+    }
+
+    /**
+     * @param DataTableState $state
+     * @param array $result
+     * @param array $map
+     * @param string $search
+     * @return array|null
+     */
+    protected function processRow(DataTableState $state, array $result, array $map, string $search)
+    {
+        $row = [];
+        $match = empty($search);
+        foreach ($state->getDataTable()->getColumns() as $column) {
+            $value = (!empty($propertyPath = $map[$column->getName()]) && $this->accessor->isReadable($result, $propertyPath)) ? $this->accessor->getValue($result, $propertyPath) : null;
+            $value = $column->transform($value, $result);
             if (!$match) {
-                continue;
-            }
-            if ($transformer) {
-                $row = call_user_func($transformer, $row, $result);
+                $match = (false !== mb_stripos($value, $search));
             }
-            yield $row;
+            $row[$column->getName()] = $column->transform($value, $result);
         }
+
+        return $match ? $row : null;
     }
 }

src/Adapter/ArrayResultSet.php

@@ -61,8 +61,8 @@ public function getTotalDisplayRecords(): int
     /**
      * {@inheritdoc}
      */
-    public function getData(): array
+    public function getData(): \Iterator
     {
-        return $this->data;
+        return new \ArrayIterator($this->data);
     }
 }

src/Adapter/ResultSetInterface.php

@@ -35,7 +35,8 @@ public function getTotalDisplayRecords(): int;
 
     /**
      * Returns the raw data in the result set.
-     * @return array
+     *
+     * @return \Iterator
      */
-    public function getData(): array;
+    public function getData(): \Iterator;
 }

src/DataTable.php

@@ -97,7 +97,7 @@ class DataTable
     /** @var DataTableState */
     private $state;
 
-    /** @var null|Instantiator */
+    /** @var Instantiator */
     private $instantiator;
 
     /**
@@ -299,7 +299,7 @@ public function getResponse(): JsonResponse
             'draw' => $this->state->getDraw(),
             'recordsTotal' => $resultSet->getTotalRecords(),
             'recordsFiltered' => $resultSet->getTotalDisplayRecords(),
-            'data' => $resultSet->getData(),
+            'data' => iterator_to_array($resultSet->getData()),
         ];
         if ($this->state->isInitial()) {
             $response['options'] = $this->getInitialResponse();