loop refactoring

tyz910 · Mar 20, 2015 · cbcaa38 · cbcaa38
1 parent 23c8f64
commit cbcaa38
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/examples/docs/processed/02-blocks.docx b/examples/docs/processed/02-blocks.docx
diff --git a/src/DocxTemplate/Content/Collection/LoopCollection.php b/src/DocxTemplate/Content/Collection/LoopCollection.php
@@ -39,6 +39,19 @@ public function getCurrentItem()
         return $this->currentItem;
     }
 
+    /**
+     * @param array $row
+     * @return $this
+     */
+    public function assignRow(array $row)
+    {
+        $item = $this->itemStart();
+        $item->assign($row);
+        $this->itemEnd();
+
+        return $this;
+    }
+
     /**
      * @return MarkedContent
      */

diff --git a/src/DocxTemplate/Content/MarkedContent.php b/src/DocxTemplate/Content/MarkedContent.php
@@ -1,6 +1,7 @@
 <?php
 namespace DocxTemplate\Content;
 
+use DocxTemplate\Content\Collection\LoopCollection;
 use DocxTemplate\Matcher;
 
 class MarkedContent extends Content
@@ -54,6 +55,24 @@ public function extractContent($name)
         return $content;
     }
 
+    /**
+     * @param string $name
+     * @param string[][] $rows
+     * @return $this
+     */
+    public function loop($name, $rows = [])
+    {
+        $block = $this->extractContent($name);
+        $loop = new LoopCollection($block);
+
+        foreach ($rows as $row) {
+            $loop->assignRow($row);
+        }
+
+        $loop->finish();
+        return $this;
+    }
+
     /**
      * @return string[]
      */

diff --git a/src/DocxTemplate/Template.php b/src/DocxTemplate/Template.php
@@ -1,7 +1,6 @@
 <?php
 namespace DocxTemplate;
 
-use DocxTemplate\Content\Collection\LoopCollection;
 use DocxTemplate\Content\MarkedContent;
 
 class Template
@@ -70,16 +69,8 @@ public function assign($key, $value = null)
      */
     public function loop($name, $rows = [])
     {
-        $block = $this->docContent->extractContent($name);
-        $loop = new LoopCollection($block);
+        $this->docContent->loop($name, $rows);
 
-        foreach ($rows as $row) {
-            $item = $loop->itemStart();
-            $item->assign($row);
-            $loop->itemEnd();
-        }
-
-        $loop->finish();
         return $this;
     }
 }