Merge pull request #250 from bscheshirwork/accept-traversable-table-renderer

Refactoring to support generators

Author: unclead

CHANGELOG.md

@@ -4,6 +4,7 @@ Yii2 multiple input change log
 2.18.0 (in development)
 =======================
 - #246 accept `\Traversable` in model attribute for `yield` compatibility (bscheshirwork) 
+- #250 accept `\Traversable` in TableRenderer and ListRenderer for `yield` compatibility (bscheshirwork) 
 
 2.17.0
 ======

src/renderers/ListRenderer.php

@@ -105,17 +105,16 @@ protected function renderBody()
         $rows = [];
 
         if ($this->data) {
-            $cnt = count($this->data);
-            if ($this->min === $this->max && $cnt < $this->max) {
-                $cnt = $this->max;
+            $j = 0;
+            foreach ($this->data as $index => $item) {
+                if ($j++ <= $this->max) {
+                    $rows[] = $this->renderRowContent($index, $item);
+                } else {
+                    break;
+                }
             }
-
-            $indices = array_keys($this->data);
-
-            for ($i = 0; $i < $cnt; $i++) {
-                $index = ArrayHelper::getValue($indices, $i, $i);
-                $item = ArrayHelper::getValue($this->data, $index, null);
-                $rows[] = $this->renderRowContent($index, $item);
+            for ($i = $j; $i < $this->min; $i++) {
+                $rows[] = $this->renderRowContent($i);
             }
         } elseif ($this->min > 0) {
             for ($i = 0; $i < $this->min; $i++) {

src/renderers/TableRenderer.php

@@ -170,17 +170,16 @@ protected function renderBody()
         $rows = [];
 
         if ($this->data) {
-            $cnt = count($this->data);
-            if ($this->min === $this->max && $cnt < $this->max) {
-                $cnt = $this->max;
+            $j = 0;
+            foreach ($this->data as $index => $item) {
+                if ($j++ <= $this->max) {
+                    $rows[] = $this->renderRowContent($index, $item);
+                } else {
+                    break;
+                }
             }
-            
-            $indices = array_keys($this->data);
-
-            for ($i = 0; $i < $cnt; $i++) {
-                $index = ArrayHelper::getValue($indices, $i, $i);
-                $item = ArrayHelper::getValue($this->data, $index, null);
-                $rows[] = $this->renderRowContent($index, $item);
+            for ($i = $j; $i < $this->min; $i++) {
+                $rows[] = $this->renderRowContent($i);
             }
         } elseif ($this->min > 0) {
             for ($i = 0; $i < $this->min; $i++) {