From 00d11897f13178016348bc3164b2f151320f6652 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Sun, 24 Jul 2022 20:24:17 +0100
Subject: [PATCH 1/6] build: upgrade dom requirement and loosen version range

---
 composer.json |  2 +-
 composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index bc58106..3dcba5b 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"require": {
 		"php": ">=8.1",
 		"ext-dom": "*",
-		"phpgt/dom": "v4.0.1"
+		"phpgt/dom": "^v4.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "v1.8.1",
diff --git a/composer.lock b/composer.lock
index 64e87f3..44ec4c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b57878c0e886a9e8f58619865fa2caa7",
+    "content-hash": "e544480a9ca0ce7658c288d6d07887ab",
     "packages": [
         {
             "name": "phpgt/cssxpath",
@@ -62,16 +62,16 @@
         },
         {
             "name": "phpgt/dom",
-            "version": "v4.0.1",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhpGt/Dom.git",
-                "reference": "6d802e8ed4b3bf42887d1ea23a10ebf29094d492"
+                "reference": "32106d0ea4273f9366d35e58bfdf3bfdb2548c7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/6d802e8ed4b3bf42887d1ea23a10ebf29094d492",
-                "reference": "6d802e8ed4b3bf42887d1ea23a10ebf29094d492",
+                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/32106d0ea4273f9366d35e58bfdf3bfdb2548c7a",
+                "reference": "32106d0ea4273f9366d35e58bfdf3bfdb2548c7a",
                 "shasum": ""
             },
             "require": {
@@ -84,7 +84,7 @@
                 "psr/http-message": "^1.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "v1.8.0",
+                "phpstan/phpstan": "v1.8.2",
                 "phpunit/phpunit": "v9.5.21"
             },
             "type": "library",
@@ -148,7 +148,7 @@
             "description": "The modern DOM API for PHP projects.",
             "support": {
                 "issues": "https://github.com/PhpGt/Dom/issues",
-                "source": "https://github.com/PhpGt/Dom/tree/v4.0.1"
+                "source": "https://github.com/PhpGt/Dom/tree/v4.0.2"
             },
             "funding": [
                 {
@@ -156,7 +156,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-07-12T15:19:44+00:00"
+            "time": "2022-07-24T18:51:01+00:00"
         },
         {
             "name": "phpgt/propfunc",

From 5d58fc48eba3626c14935007d11a0363c34eb240 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Thu, 18 Aug 2022 15:00:19 +0100
Subject: [PATCH 2/6] docs: update examples

---
 examples/binding/01-simple.php                | 10 ++
 examples/binding/02-non-trivial.php           | 46 +++++++++
 examples/binding/03-bindValue.php             |  9 ++
 examples/binding/04-bindKeyValue.php          | 10 ++
 examples/binding/05-bindData.php              | 17 ++++
 examples/binding/06-bindList.php              | 18 ++++
 examples/binding/07-bindListCallback.php      | 18 ++++
 .../binding/08-bindListCallback-nested.php    | 93 +++++++++++++++++++
 examples/binding/08-bindTable.php             | 35 -------
 examples/binding/09-bindTable.php             | 82 ++++++++++++++++
 10 files changed, 303 insertions(+), 35 deletions(-)
 create mode 100644 examples/binding/08-bindListCallback-nested.php
 delete mode 100644 examples/binding/08-bindTable.php
 create mode 100644 examples/binding/09-bindTable.php

diff --git a/examples/binding/01-simple.php b/examples/binding/01-simple.php
index a0cd4be..3837060 100644
--- a/examples/binding/01-simple.php
+++ b/examples/binding/01-simple.php
@@ -7,6 +7,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#simplest-possible-usage
 
 $html = <<<HTML
+<!DOCTYPE html>
 <h1 data-bind:text>Name</h1>
 HTML;
 
@@ -21,3 +22,12 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+	<h1>Cody</h1>
+</body>
+</html>
+*/
diff --git a/examples/binding/02-non-trivial.php b/examples/binding/02-non-trivial.php
index 8bd25f3..9382906 100644
--- a/examples/binding/02-non-trivial.php
+++ b/examples/binding/02-non-trivial.php
@@ -10,6 +10,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#non-trivial-usage
 
 $html = <<<HTML
+<!DOCTYPE html>
 <h1>Top three drivers of <span data-bind:text="year">0000</span></h1>
 
 <ul>
@@ -50,6 +51,51 @@ function example(DocumentBinder $binder, DriverRepository $driverRepo):void {
 $binder->cleanDatasets();
 echo $document;
 
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <h1>Top three drivers of <span>2022</span></h1>
+
+    <ul id="template-parent-62fe4594d5666">
+        <li>
+            <h2>Lewis Hamilton</h2>
+            <h3>Mercedes</h3>
+
+            <p>Points: <span>347</span>
+            </p>
+            <div>
+                <img src="/flag/GBR.png" alt="Flag of United Kingdom">
+                <p>United Kingdom</p>
+            </div>
+        </li>
+        <li>
+            <h2>Valtteri Bottas</h2>
+            <h3>Mercedes</h3>
+
+            <p>Points: <span>223</span>
+            </p>
+            <div>
+                <img src="/flag/FIN.png" alt="Flag of Finland">
+                <p>Finland</p>
+            </div>
+        </li>
+        <li>
+            <h2>Max Verstappen</h2>
+            <h3>Red Bull Racing Honda</h3>
+
+            <p>Points: <span>214</span>
+            </p>
+            <div>
+                <img src="/flag/NED.png" alt="Flag of Netherlands">
+                <p>Netherlands</p>
+            </div>
+        </li>
+    </ul>
+</body>
+</html>
+*/
+
 class DriverRepository {
 	/** @return array<Driver>
 	 * @noinspection PhpUnusedParameterInspection
diff --git a/examples/binding/03-bindValue.php b/examples/binding/03-bindValue.php
index 63571db..5eccf6f 100644
--- a/examples/binding/03-bindValue.php
+++ b/examples/binding/03-bindValue.php
@@ -7,6 +7,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindvalue
 
 $html = <<<HTML
+<!DOCTYPE html>
 <p data-bind:text>This is a quick example</p>
 HTML;
 
@@ -21,3 +22,11 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+	<p>This is an updated example</p>
+</body>
+</html>
diff --git a/examples/binding/04-bindKeyValue.php b/examples/binding/04-bindKeyValue.php
index 4b57ca4..17e54cb 100644
--- a/examples/binding/04-bindKeyValue.php
+++ b/examples/binding/04-bindKeyValue.php
@@ -7,6 +7,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindkeyvalue
 
 $html = <<<HTML
+<!doctype html>
 <h1>Hello, <span data-bind:text="name">you</span>!</h1>
 HTML;
 
@@ -21,3 +22,12 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+	<h1>Hello, <span>Cody</span>!</h1>
+</body>
+</html>
+*/
diff --git a/examples/binding/05-bindData.php b/examples/binding/05-bindData.php
index 2581f14..3dfdf37 100644
--- a/examples/binding/05-bindData.php
+++ b/examples/binding/05-bindData.php
@@ -7,6 +7,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindkeyvalue
 
 $html = <<<HTML
+<!doctype html>
 <h1>User profile</h1>
 
 <div>
@@ -35,3 +36,19 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <h1>User profile</h1>
+
+    <div>
+        <h2>PhpNut</h2>
+        <p>Full name: <span>Larry E. Masters</span></p>
+        <p>Bio: <span>Christian - Dad - 4x Grandad - Co-Founder of @CakePHP - Developer - Open Source Advocate</span></p>
+    </div>
+</body>
+
+</html>
+*/
diff --git a/examples/binding/06-bindList.php b/examples/binding/06-bindList.php
index 6133621..6e38c31 100644
--- a/examples/binding/06-bindList.php
+++ b/examples/binding/06-bindList.php
@@ -7,6 +7,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindlist
 
 $html = <<<HTML
+<!doctype html>
 <h1>Shopping list</h1>
 
 <ul>
@@ -31,3 +32,20 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <h1>Shopping list</h1>
+
+    <ul id="template-parent-62fe45171c32e">
+
+        <li>Eggs</li>
+        <li>Potatoes</li>
+        <li>Butter</li>
+        <li>Plain flour</li>
+    </ul>
+</body>
+</html>
+*/
diff --git a/examples/binding/07-bindListCallback.php b/examples/binding/07-bindListCallback.php
index d27de9d..e884619 100644
--- a/examples/binding/07-bindListCallback.php
+++ b/examples/binding/07-bindListCallback.php
@@ -8,6 +8,7 @@
 // EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindlistcallback
 
 $html = <<<HTML
+<!doctype html>
 <h1>Shopping list</h1>
 
 <ul>
@@ -35,3 +36,20 @@ function example(DocumentBinder $binder):void {
 example($binder);
 $binder->cleanDatasets();
 echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <h1>Shopping list</h1>
+
+    <ul id="template-parent-62fe44ffc92e0">
+        <li class="item-0">Eggs (item 0)</li>
+        <li class="item-1">Potatoes (item 1)</li>
+        <li class="item-2">Butter (item 2)</li>
+        <li class="item-3">Plain flour (item 3)</li>
+    </ul>
+</body>
+
+</html>
+*/
diff --git a/examples/binding/08-bindListCallback-nested.php b/examples/binding/08-bindListCallback-nested.php
new file mode 100644
index 0000000..6aacbf8
--- /dev/null
+++ b/examples/binding/08-bindListCallback-nested.php
@@ -0,0 +1,93 @@
+<?php
+use Gt\Dom\Element;
+use Gt\Dom\HTMLDocument;
+use Gt\DomTemplate\DocumentBinder;
+
+require __DIR__ . "/../../vendor/autoload.php";
+
+// EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindlistcallback
+
+$html = <<<HTML
+<!doctype html>
+<h1>Menu</h1>
+
+<ul>
+	<li data-template>
+		<h2 data-bind:text="title">Menu item title</h2>
+		<p>Ingredients:</p>
+		<ul>
+			<li data-template data-bind:text>Ingredient goes here</li>
+		</ul>	
+	</li>
+</ul>
+HTML;
+
+function example(DocumentBinder $binder):void {
+	$listData = [
+		[
+			"title" => "Roast king oyster mushroom",
+			"ingredients" => ["hazelnut", "summer truffle", "black garlic"],
+		],
+		[
+			"title" => "Cornish skate wing",
+			"ingredients" => ["borlotti cassoulet", "lilliput caper", "baby gem", "orange oil"],
+		],
+		[
+			"title" => "Aged Derbyshire beef",
+			"ingredients" => ["turnip", "pickled mustard", "bone marrow mash", "rainbow chard"],
+		],
+	];
+	$binder->bindListCallback($listData, function(Element $element, $listItem, $listKey) use($binder) {
+		$binder->bindKeyValue("title", $listItem["title"]);
+		$binder->bindList($listItem["ingredients"], $element);
+	});
+}
+
+// END OF EXAMPLE CODE.
+
+$document = new HTMLDocument($html);
+$binder = new DocumentBinder($document);
+example($binder);
+$binder->cleanDatasets();
+echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <h1>Menu</h1>
+
+    <ul id="template-parent-62fe445401332">
+        <li>
+            <h2>Roast king oyster mushroom</h2>
+            <p>Ingredients:</p>
+            <ul id="template-parent-62fe44540144e">
+                <li>hazelnut</li>
+                <li>summer truffle</li>
+                <li>black garlic</li>
+            </ul>
+        </li>
+        <li>
+            <h2>Cornish skate wing</h2>
+            <p>Ingredients:</p>
+            <ul id="template-parent-62fe44540144e">
+                <li>borlotti cassoulet</li>
+                <li>lilliput caper</li>
+                <li>baby gem</li>
+                <li>orange oil</li>
+            </ul>
+        </li>
+        <li>
+            <h2>Aged Derbyshire beef</h2>
+            <p>Ingredients:</p>
+            <ul id="template-parent-62fe44540144e">
+                <li>turnip</li>
+                <li>pickled mustard</li>
+                <li>bone marrow mash</li>
+                <li>rainbow chard</li>
+            </ul>
+        </li>
+    </ul>
+</body>
+</html>
+ */
diff --git a/examples/binding/08-bindTable.php b/examples/binding/08-bindTable.php
deleted file mode 100644
index f4d6f9e..0000000
--- a/examples/binding/08-bindTable.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-use Gt\Dom\HTMLDocument;
-use Gt\DomTemplate\DocumentBinder;
-
-require __DIR__ . "/../../vendor/autoload.php";
-
-// EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindtable
-
-$html = <<<HTML
-<table>
-	<thead>
-		<tr>
-			<th>Day</th>
-			<th>Weather</th>
-		</tr>
-	</thead>
-</table>
-HTML;
-
-function example(DocumentBinder $binder):void {
-	$tableData = [
-		"Day" => ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-		"Weather" => ["Rain", "Cloud", "Cloud", "Sun", "Sun", "Cloud", "Cloud"],
-	];
-
-	$binder->bindTable($tableData);
-}
-
-// END OF EXAMPLE CODE.
-
-$document = new HTMLDocument($html);
-$binder = new DocumentBinder($document);
-example($binder);
-$binder->cleanDatasets();
-echo $document;
diff --git a/examples/binding/09-bindTable.php b/examples/binding/09-bindTable.php
new file mode 100644
index 0000000..c1be061
--- /dev/null
+++ b/examples/binding/09-bindTable.php
@@ -0,0 +1,82 @@
+<?php
+use Gt\Dom\HTMLDocument;
+use Gt\DomTemplate\DocumentBinder;
+
+require __DIR__ . "/../../vendor/autoload.php";
+
+// EXAMPLE CODE: https://github.com/PhpGt/DomTemplate/wiki/Binding#bindtable
+
+$html = <<<HTML
+<table>
+	<thead>
+		<tr>
+			<th>Day</th>
+			<th>Weather</th>
+		</tr>
+	</thead>
+</table>
+HTML;
+
+function example(DocumentBinder $binder):void {
+	$tableData = [
+		"Day" => ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+		"Weather" => ["Rain", "Cloud", "Cloud", "Sun", "Sun", "Cloud", "Cloud"],
+	];
+
+	$binder->bindTable($tableData);
+}
+
+// END OF EXAMPLE CODE.
+
+$document = new HTMLDocument($html);
+$binder = new DocumentBinder($document);
+example($binder);
+$binder->cleanDatasets();
+echo $document;
+
+/* Output:
+<!DOCTYPE html>
+<html>
+<body>
+    <table>
+        <thead>
+            <tr>
+                <th>Day</th>
+                <th>Weather</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>Mon</td>
+                <td>Rain</td>
+            </tr>
+            <tr>
+                <td>Tue</td>
+                <td>Cloud</td>
+            </tr>
+            <tr>
+                <td>Wed</td>
+                <td>Cloud</td>
+            </tr>
+            <tr>
+                <td>Thu</td>
+                <td>Sun</td>
+            </tr>
+            <tr>
+                <td>Fri</td>
+                <td>Sun</td>
+            </tr>
+            <tr>
+                <td>Sat</td>
+                <td>Cloud</td>
+            </tr>
+            <tr>
+                <td>Sun</td>
+                <td>Cloud</td>
+            </tr>
+        </tbody>
+    </table>
+</body>
+
+</html>
+*/

From 3dbda21373262cb8bf6ca7dfeb56c10fcf7f7f52 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Tue, 17 Jan 2023 11:41:17 +0000
Subject: [PATCH 3/6] feature: trim whitespace when there are only template
 children closes #363

---
 src/TemplateCollection.php                    |  1 +
 src/TemplateElement.php                       | 15 +++++++++++
 test/phpunit/TemplateCollectionTest.php       | 26 +++++++++++++++++++
 .../TestFactory/DocumentTestFactory.php       | 10 +++++++
 4 files changed, 52 insertions(+)

diff --git a/src/TemplateCollection.php b/src/TemplateCollection.php
index b81b736..a68548d 100644
--- a/src/TemplateCollection.php
+++ b/src/TemplateCollection.php
@@ -60,6 +60,7 @@ private function extractTemplates(Document $document):void {
 
 	private function findMatch(Element $context):TemplateElement {
 		$contextPath = (string)(new NodePathCalculator($context));
+		/** @noinspection RegExpRedundantEscape */
 		$contextPath = preg_replace(
 			"/(\[\d+\])/",
 			"",
diff --git a/src/TemplateElement.php b/src/TemplateElement.php
index 48ccc64..a87c0eb 100644
--- a/src/TemplateElement.php
+++ b/src/TemplateElement.php
@@ -4,6 +4,7 @@
 use Gt\Dom\Element;
 use Gt\Dom\Node;
 use Gt\Dom\Text;
+use Throwable;
 
 class TemplateElement {
 	private string $templateParentPath;
@@ -36,6 +37,20 @@ public function __construct(
 
 	public function removeOriginalElement():void {
 		$this->originalElement->remove();
+		try {
+			$parent = $this->getTemplateParent();
+			if(count($parent->children) === 0) {
+				if($firstNode = $parent->childNodes[0] ?? null) {
+					if(trim($firstNode->wholeText) === "") {
+						$parent->innerHTML = "";
+					}
+				}
+			}
+		}
+// In nested lists, there may not be an actual element attached to the document
+// yet, but the parent still has a path - this outcome is expected and
+// completely fine in this case.
+		catch(Throwable) {}
 	}
 
 	public function getClone():Node|Element {
diff --git a/test/phpunit/TemplateCollectionTest.php b/test/phpunit/TemplateCollectionTest.php
index f35d1dc..cf16f9c 100644
--- a/test/phpunit/TemplateCollectionTest.php
+++ b/test/phpunit/TemplateCollectionTest.php
@@ -116,4 +116,30 @@ public function testBindListData_nestedList_manual():void {
 			}
 		}
 	}
+
+	public function testConstructor_removesWhitespace():void {
+		$document = new HTMLDocument(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		new TemplateCollection($document);
+		self::assertSame("", $document->querySelector("ul")->innerHTML);
+	}
+
+	public function testConstructor_nonTemplateChildrenArePreserved():void {
+		$document = new HTMLDocument(DocumentTestFactory::HTML_LIST_WITH_TEXTNODE);
+		new TemplateCollection($document);
+		$ulChildren = $document->querySelector("ul")->children;
+		self::assertCount(1, $ulChildren);
+		self::assertSame("This list item will always show at the end", $ulChildren[0]->textContent);
+	}
+
+	public function testConstructor_nonTemplateChildrenArePreservedInOrder():void {
+		$document = new HTMLDocument(DocumentTestFactory::HTML_LIST_WITH_TEXTNODE);
+		$sut = new TemplateCollection($document);
+		$ulChildren = $document->querySelector("ul")->children;
+		$template = $sut->get($document);
+		$template->insertTemplate();
+		$template->insertTemplate();
+		$template->insertTemplate();
+		self::assertCount(4, $ulChildren);
+		self::assertSame("This list item will always show at the end", $ulChildren[3]->textContent);
+	}
 }
diff --git a/test/phpunit/TestFactory/DocumentTestFactory.php b/test/phpunit/TestFactory/DocumentTestFactory.php
index 2a77fbf..bea5ca3 100644
--- a/test/phpunit/TestFactory/DocumentTestFactory.php
+++ b/test/phpunit/TestFactory/DocumentTestFactory.php
@@ -244,6 +244,16 @@ class DocumentTestFactory {
 </ol>
 HTML;
 
+	const HTML_LIST_WITH_TEXTNODE = <<<HTML
+<!doctype html>
+<!doctype html>
+<ul>
+	<li data-template data-bind:text>Template item!</li>
+	<li>This list item will always show at the end</li>
+</ul>
+HTML;
+
+
 	const HTML_TWO_LISTS = <<<HTML
 <!doctype html>
 <div id="favourites">

From 7745df0907afe633d20d99730fab32ed62bd224f Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Tue, 31 Jan 2023 13:36:51 +0000
Subject: [PATCH 4/6] maintenance: phpstorm analysis improvements

---
 composer.lock              |  76 +++++++++----------
 src/ElementBinder.php      |   7 --
 src/ListBinder.php         |   5 +-
 src/NodePathCalculator.php |   4 +-
 src/PartialContent.php     |   2 +-
 src/TableBinder.php        | 151 +++++++++++++++++++------------------
 src/TemplateCollection.php |   4 +-
 7 files changed, 122 insertions(+), 127 deletions(-)

diff --git a/composer.lock b/composer.lock
index 7887866..190ecf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -267,30 +267,30 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -317,7 +317,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -333,7 +333,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -396,16 +396,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                 "shasum": ""
             },
             "require": {
@@ -446,9 +446,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
             },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -563,16 +563,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.4",
+            "version": "1.9.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2"
+                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03bccee595e2146b7c9d174486b84f4dc61b0f2",
-                "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58",
+                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58",
                 "shasum": ""
             },
             "require": {
@@ -602,7 +602,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.4"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.14"
             },
             "funding": [
                 {
@@ -618,20 +618,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-17T13:33:52+00:00"
+            "time": "2023-01-19T10:47:09+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.21",
+            "version": "9.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3f893e19712bb0c8bc86665d1562e9fd509c4ef0",
-                "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                 "shasum": ""
             },
             "require": {
@@ -687,7 +687,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.21"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
             },
             "funding": [
                 {
@@ -695,7 +695,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-14T13:26:54+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -940,20 +940,20 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.27",
+            "version": "9.5.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -1022,7 +1022,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
             },
             "funding": [
                 {
@@ -1038,7 +1038,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-09T07:31:23+00:00"
+            "time": "2023-01-14T12:32:24+00:00"
         },
         {
             "name": "sebastian/cli-parser",
diff --git a/src/ElementBinder.php b/src/ElementBinder.php
index a1c303a..592bb7b 100644
--- a/src/ElementBinder.php
+++ b/src/ElementBinder.php
@@ -1,14 +1,7 @@
 <?php
 namespace Gt\DomTemplate;
 
-use Gt\Dom\DOMTokenList;
 use Gt\Dom\Element;
-use Gt\Dom\Facade\DOMTokenListFactory;
-use Gt\Dom\Node;
-use Gt\Dom\XPathResult;
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionProperty;
 
 class ElementBinder {
 	private HTMLAttributeBinder $htmlAttributeBinder;
diff --git a/src/ListBinder.php b/src/ListBinder.php
index d3d90f3..43d45ce 100644
--- a/src/ListBinder.php
+++ b/src/ListBinder.php
@@ -10,6 +10,7 @@
 class ListBinder {
 	private BindableCache $bindableCache;
 
+	/** @noinspection PhpPropertyCanBeReadonlyInspection */
 	public function __construct(
 		private TemplateCollection $templateCollection,
 		?BindableCache $bindableCache = null
@@ -17,7 +18,7 @@ public function __construct(
 		$this->bindableCache = $bindableCache ?? new BindableCache();
 	}
 
-	/** @param iterable<mixed> $listData */
+	/** @param iterable<int|string,mixed> $listData */
 	public function bindListData(
 		iterable $listData,
 		Document|Element $context,
@@ -102,7 +103,7 @@ public function bindListData(
 		return $nestedCount + $i + 1;
 	}
 
-	/** @param iterable<mixed>|array<mixed> $listData */
+	/** @param iterable<int|string,mixed> $listData */
 	private function isEmpty(iterable $listData):bool {
 		if(is_array($listData)) {
 			return is_null(array_key_first($listData));
diff --git a/src/NodePathCalculator.php b/src/NodePathCalculator.php
index c0d456d..4973907 100644
--- a/src/NodePathCalculator.php
+++ b/src/NodePathCalculator.php
@@ -7,7 +7,7 @@
 
 class NodePathCalculator implements Stringable {
 	public function __construct(
-		private Node|Element $element
+		private readonly Node|Element $element
 	) {
 	}
 
@@ -39,7 +39,7 @@ public function __toString():string {
 			$path = "/" . $contextPath . $path;
 			$context = $context->parentElement;
 		}
-		while($context && $context instanceof Element);
+		while($context instanceof Element);
 
 		return $path;
 	}
diff --git a/src/PartialContent.php b/src/PartialContent.php
index 7e84ac1..0965ba1 100644
--- a/src/PartialContent.php
+++ b/src/PartialContent.php
@@ -5,7 +5,7 @@
 
 class PartialContent {
 	public function __construct(
-		private string $dirPath
+		private readonly string $dirPath
 	) {
 		if(!is_dir($this->dirPath)) {
 			throw new PartialContentDirectoryNotFoundException("The partial content path does not exist: $this->dirPath");
diff --git a/src/TableBinder.php b/src/TableBinder.php
index 5d6012b..766f571 100644
--- a/src/TableBinder.php
+++ b/src/TableBinder.php
@@ -7,6 +7,7 @@
 use Traversable;
 
 class TableBinder {
+	/** @noinspection PhpPropertyCanBeReadonlyInspection */
 	public function __construct(
 		private ?TemplateCollection $templateCollection = null,
 		private ?ElementBinder $elementBinder = null,
@@ -168,6 +169,81 @@ public function bindTableData(
 		}
 	}
 
+	/** @param array<int,array<int,string>>|array<int,array<string,string>>|array<string,array<int,string>>|array<int, array<int,string>|array<string,string>> $array */
+	public function detectTableDataStructureType(array $array):TableDataStructureType {
+		if(empty($array)) {
+			return TableDataStructureType::NORMALISED;
+		}
+
+		reset($array);
+
+		if(array_is_list($array)) {
+			$allRowsAreLists = true;
+			$allRowDataAreLists = true;
+			$allRowDataAreAssoc = true;
+
+			foreach($array as $rowIndex => $rowData) {
+				if(!is_array($rowData)) {
+					throw new IncorrectTableDataFormat("Row $rowIndex data is not iterable");
+				}
+
+				if(array_is_list($rowData)) {
+					$allRowDataAreAssoc = false;
+				}
+				else {
+					$allRowsAreLists = false;
+				}
+
+				/**
+				 * @var int|string $cellIndex
+				 * @var string|array<string> $cellData
+				 */
+				foreach($rowData as $cellIndex => $cellData) {
+					if($rowIndex > 0) {
+						if(isset($array[0]) && is_array($array[0]) && array_is_list($array[0]) && !array_is_list($rowData)) {
+							if(!is_iterable($cellData)) {
+								throw new IncorrectTableDataFormat("Row $rowIndex has a string key ($cellIndex) but the value is not iterable.");
+							}
+						}
+
+						if(!is_array($cellData) || !array_is_list($cellData)) {
+							$allRowDataAreLists = false;
+						}
+					}
+				}
+			}
+
+			if($allRowsAreLists) {
+				return TableDataStructureType::NORMALISED;
+			}
+			else {
+				if($allRowDataAreLists) {
+					return TableDataStructureType::DOUBLE_HEADER;
+				}
+				elseif($allRowDataAreAssoc) {
+					return TableDataStructureType::ASSOC_ROW;
+				}
+			}
+		}
+		else {
+			$allRowDataAreLists = true;
+			foreach($array as $rowIndex => $rowData) {
+				if(!is_array($rowData)) {
+					throw new IncorrectTableDataFormat("Column data \"$rowIndex\" is not iterable.");
+				}
+				if(!array_is_list($rowData)) {
+					$allRowDataAreLists = false;
+				}
+			}
+
+			if($allRowDataAreLists) {
+				return TableDataStructureType::HEADER_VALUE_LIST;
+			}
+		}
+
+		throw new IncorrectTableDataFormat();
+	}
+
 	/**
 	 * @param iterable<int,iterable<int,string>>|iterable<int,iterable<string,string>>|iterable<string,iterable<int,string>>|iterable<int, iterable<int,string>|iterable<string,string>> $bindValue
 	 * The structures allowed by this method are:
@@ -252,81 +328,6 @@ private function normaliseTableData(iterable $bindValue):array {
 		return $normalised;
 	}
 
-	/** @param array<int,array<int,string>>|array<int,array<string,string>>|array<string,array<int,string>>|array<int, array<int,string>|array<string,string>> $array */
-	public function detectTableDataStructureType(array $array):TableDataStructureType {
-		if(empty($array)) {
-			return TableDataStructureType::NORMALISED;
-		}
-
-		reset($array);
-
-		if(array_is_list($array)) {
-			$allRowsAreLists = true;
-			$allRowDataAreLists = true;
-			$allRowDataAreAssoc = true;
-
-			foreach($array as $rowIndex => $rowData) {
-				if(!is_array($rowData)) {
-					throw new IncorrectTableDataFormat("Row $rowIndex data is not iterable");
-				}
-
-				if(array_is_list($rowData)) {
-					$allRowDataAreAssoc = false;
-				}
-				else {
-					$allRowsAreLists = false;
-				}
-
-                /**
-                 * @var int|string $cellIndex
-                 * @var string|array<string> $cellData
-                 */
-                foreach($rowData as $cellIndex => $cellData) {
-					if($rowIndex > 0) {
-						if(isset($array[0]) && is_array($array[0]) && array_is_list($array[0]) && !array_is_list($rowData)) {
-							if(!is_iterable($cellData)) {
-								throw new IncorrectTableDataFormat("Row $rowIndex has a string key ($cellIndex) but the value is not iterable.");
-							}
-						}
-
-						if(!is_array($cellData) || !array_is_list($cellData)) {
-							$allRowDataAreLists = false;
-						}
-					}
-				}
-			}
-
-			if($allRowsAreLists) {
-				return TableDataStructureType::NORMALISED;
-			}
-			else {
-				if($allRowDataAreLists) {
-					return TableDataStructureType::DOUBLE_HEADER;
-				}
-				elseif($allRowDataAreAssoc) {
-					return TableDataStructureType::ASSOC_ROW;
-				}
-			}
-		}
-		else {
-			$allRowDataAreLists = true;
-			foreach($array as $rowIndex => $rowData) {
-				if(!is_array($rowData)) {
-					throw new IncorrectTableDataFormat("Column data \"$rowIndex\" is not iterable.");
-				}
-				if(!array_is_list($rowData)) {
-					$allRowDataAreLists = false;
-				}
-			}
-
-			if($allRowDataAreLists) {
-				return TableDataStructureType::HEADER_VALUE_LIST;
-			}
-		}
-
-		throw new IncorrectTableDataFormat();
-	}
-
 	private function initBinders():void {
 		if(!$this->htmlAttributeBinder) {
 			$this->htmlAttributeBinder = new HTMLAttributeBinder();
diff --git a/src/TemplateCollection.php b/src/TemplateCollection.php
index a68548d..da1d7e2 100644
--- a/src/TemplateCollection.php
+++ b/src/TemplateCollection.php
@@ -25,7 +25,7 @@ public function get(
 
 		if($templateName) {
 			if(!isset($this->elementKVP[$templateName])) {
-				throw new TemplateElementNotFoundInContextException("Template element with name \"$templateName\" can not be found within the context {$context->tagName} element.");
+				throw new TemplateElementNotFoundInContextException("Template element with name \"$templateName\" can not be found within the context $context->tagName element.");
 			}
 			return $this->elementKVP[$templateName];
 		}
@@ -86,7 +86,7 @@ private function findMatch(Element $context):TemplateElement {
 		}
 
 		throw new TemplateElementNotFoundInContextException(
-			"There is no unnamed template element in the context element ({$context->tagName})."
+			"There is no unnamed template element in the context element ($context->tagName)."
 		);
 	}
 }

From b47f5b226d47b40ab7a4f64c7d83e6ed646795a7 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 19 Jul 2023 11:34:28 +0100
Subject: [PATCH 5/6] tweak: remove data-element attribute

---
 src/DocumentBinder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/DocumentBinder.php b/src/DocumentBinder.php
index 5a82326..83b7ac6 100644
--- a/src/DocumentBinder.php
+++ b/src/DocumentBinder.php
@@ -151,6 +151,10 @@ public function cleanupDocument():void {
 
 			$item->ownerElement->removeAttribute($item->name);
 		}
+
+		foreach($this->document->querySelectorAll("[data-element]") as $dataElement) {
+			$dataElement->removeAttribute("data-element");
+		}
 	}
 
 	private function bind(

From 01541ae3530e71a6482e670cf159a9399a6d0cbc Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 14 Feb 2024 19:43:17 +0000
Subject: [PATCH 6/6] fix: recursive call to bindList if value is itself a list
 for #486

---
 src/ListBinder.php                            |  4 +++
 test/phpunit/DocumentBinderTest.php           | 34 +++++++++++++++++++
 test/phpunit/TestHelper/HTMLPageContent.php   | 16 +++++++++
 .../Model/ArrayIterator/Product/Product.php   |  8 +++++
 .../ArrayIterator/Product/ProductList.php     | 25 ++++++++++++++
 5 files changed, 87 insertions(+)
 create mode 100644 test/phpunit/TestHelper/Model/ArrayIterator/Product/Product.php
 create mode 100644 test/phpunit/TestHelper/Model/ArrayIterator/Product/ProductList.php

diff --git a/src/ListBinder.php b/src/ListBinder.php
index 8d0933c..b2f1843 100644
--- a/src/ListBinder.php
+++ b/src/ListBinder.php
@@ -73,6 +73,10 @@ public function bindListData(
 // If the $listValue's first value is iterable, then treat this as a nested list.
 			if($this->isNested($listValue)) {
 				$elementBinder->bind(null, $listKey, $t);
+				$this->bindListData(
+					$listValue,
+					$t,
+				);
 				foreach($this->bindableCache->convertToKvp($listValue) as $key => $value) {
 					$elementBinder->bind($key, $value, $t);
 				}
diff --git a/test/phpunit/DocumentBinderTest.php b/test/phpunit/DocumentBinderTest.php
index 3ad20e3..134dd03 100644
--- a/test/phpunit/DocumentBinderTest.php
+++ b/test/phpunit/DocumentBinderTest.php
@@ -25,6 +25,7 @@
 use Gt\DomTemplate\Test\TestHelper\HTMLPageContent;
 use Gt\DomTemplate\Test\TestHelper\ExampleClass;
 use Gt\DomTemplate\Test\TestHelper\Model\Address;
+use Gt\DomTemplate\Test\TestHelper\Model\ArrayIterator\Product\ProductList;
 use Gt\DomTemplate\Test\TestHelper\Model\Country;
 use Gt\DomTemplate\Test\TestHelper\Model\Customer;
 use PHPUnit\Framework\TestCase;
@@ -1366,6 +1367,39 @@ public function getIterator():Traversable {
 		self::assertCount(1, $ol->children);
 	}
 
+	public function testBindList_arrayIterator():void {
+		$document = new HTMLDocument(HTMLPageContent::HTML_SHOP_PRODUCTS);
+		$sut = new DocumentBinder($document);
+		$sut->setDependencies(...$this->documentBinderDependencies($document));
+
+		$categoryNameList = ["Category 1", "Category 2"];
+		$productNameList = [
+			["Product 1 in cat 1", "Product 2 in cat 1"],
+			["Product 3 in cat 2", "Product 4 in cat 2", "Product 5 in cat 2"],
+		];
+
+		$obj = new ProductList(
+			$categoryNameList,
+			$productNameList,
+		);
+		$sut->bindList($obj);
+
+		$categoryList = $document->querySelector("ul.categoryList");
+		self::assertCount(count($categoryNameList), $categoryList->children);
+
+		$productCount = 0;
+		foreach($categoryList->children as $categoryIndex => $categoryLi) {
+			self::assertSame("Category " . ($categoryIndex + 1), $categoryLi->querySelector("h2")->innerText);
+
+			self::assertCount(count($productNameList[$categoryIndex]), $categoryLi->querySelector("ul")->children);
+
+			foreach($categoryLi->querySelectorAll("ul li") as $productIndex => $productLi) {
+				self::assertSame("Product " . ($productCount + 1) . " in cat " . ($categoryIndex + 1), $productLi->textContent);
+				$productCount++;
+			}
+		}
+	}
+
 	private function documentBinderDependencies(HTMLDocument $document, mixed...$otherObjectList):array {
 		$htmlAttributeBinder = new HTMLAttributeBinder();
 		$htmlAttributeCollection = new HTMLAttributeCollection();
diff --git a/test/phpunit/TestHelper/HTMLPageContent.php b/test/phpunit/TestHelper/HTMLPageContent.php
index c67822b..1b800e4 100644
--- a/test/phpunit/TestHelper/HTMLPageContent.php
+++ b/test/phpunit/TestHelper/HTMLPageContent.php
@@ -1034,6 +1034,22 @@ class HTMLPageContent {
 </customer-list>
 HTML;
 
+	const HTML_SHOP_PRODUCTS = <<<HTML
+<!doctype html>
+<h1>Categorised shop items</h1>
+
+<ul class="categoryList">
+	<li data-list>
+		<h2 data-bind:text>Category name</h2>
+		
+		<ul class="productList">
+			<li data-list data-bind:text="name">Product name</li>
+		</ul>
+	</li>
+</ul>
+HTML;
+
+
 	const HTML_REMOVE_UNBOUND = <<<HTML
 <!doctype html>
 <h1>Log in to the system</h1>
diff --git a/test/phpunit/TestHelper/Model/ArrayIterator/Product/Product.php b/test/phpunit/TestHelper/Model/ArrayIterator/Product/Product.php
new file mode 100644
index 0000000..8710ace
--- /dev/null
+++ b/test/phpunit/TestHelper/Model/ArrayIterator/Product/Product.php
@@ -0,0 +1,8 @@
+<?php
+namespace Gt\DomTemplate\Test\TestHelper\Model\ArrayIterator\Product;
+
+class Product {
+	public function __construct(
+		public readonly string $name
+	) {}
+}
diff --git a/test/phpunit/TestHelper/Model/ArrayIterator/Product/ProductList.php b/test/phpunit/TestHelper/Model/ArrayIterator/Product/ProductList.php
new file mode 100644
index 0000000..04b78b7
--- /dev/null
+++ b/test/phpunit/TestHelper/Model/ArrayIterator/Product/ProductList.php
@@ -0,0 +1,25 @@
+<?php
+namespace Gt\DomTemplate\Test\TestHelper\Model\ArrayIterator\Product;
+
+use ArrayIterator;
+
+class ProductList extends ArrayIterator {
+	/**
+	 * @param array<string> $categoryNameList
+	 * @param array<array<string>> $productNameList
+	 */
+	public function __construct(array $categoryNameList, array $productNameList) {
+		/** @var array<string, array<Product>> $categorisedProducts */
+		$categorisedProducts = [];
+
+		foreach($categoryNameList as $i => $categoryName) {
+			$categorisedProducts[$categoryName] = [];
+
+			foreach($productNameList[$i] as $productName) {
+				array_push($categorisedProducts[$categoryName], new Product($productName));
+			}
+		}
+
+		parent::__construct($categorisedProducts);
+	}
+}