Merge pull request #123 from PhpGt/122-iterator-count

Iterators are now countable
PhpGt · Apr 17, 2018 · 343babc · 343babc
2 parents 636f6a4 + e34d75e
commit 343babc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/src/NodeList.php b/src/NodeList.php
@@ -9,7 +9,8 @@
 class NodeList implements Iterator, ArrayAccess, Countable {
 	use LiveProperty;
 
-	private $domNodeList;
+	protected $domNodeList;
+	protected $iteratorKey;
 
 	public function __construct(DOMNodeList $domNodeList) {
 		$this->domNodeList = $domNodeList;
@@ -21,11 +22,14 @@ public function __construct(DOMNodeList $domNodeList) {
 	 * @return int Number of Elements
 	 */
 	private function prop_get_length():int {
+		$key = $this->iteratorKey;
+
 		$length = 0;
 		foreach($this as $element) {
 			$length++;
 		}
 
+		$this->iteratorKey = $key;
 		return $length;
 	}
 
@@ -53,34 +57,32 @@ public function item($index) {
 
 // Iterator --------------------------------------------------------------------
 
-	private $key = 0;
-
 	public function current():Element {
-		return $this->domNodeList[$this->key];
+		return $this->domNodeList[$this->iteratorKey];
 	}
 
 	public function key():int {
-		return $this->key;
+		return $this->iteratorKey;
 	}
 
 	public function next() {
-		$this->key++;
+		$this->iteratorKey++;
 		$this->incrementKeyToNextElement();
 	}
 
 	public function rewind() {
-		$this->key = 0;
+		$this->iteratorKey = 0;
 		$this->incrementKeyToNextElement();
 	}
 
 	public function valid():bool {
-		return isset($this->domNodeList[$this->key]);
+		return isset($this->domNodeList[$this->iteratorKey]);
 	}
 
 	private function incrementKeyToNextElement() {
 		while($this->valid()
-			&& !$this->domNodeList[$this->key] instanceof Element) {
-			$this->key++;
+			&& !$this->domNodeList[$this->iteratorKey] instanceof Element) {
+			$this->iteratorKey++;
 		}
 	}
 

diff --git a/test/unit/Helper/Helper.php b/test/unit/Helper/Helper.php
@@ -59,6 +59,17 @@ class Helper {
 </body>
 </html>
 HTML;
+
+	const HTML_SECTIONS_WITHIN_FORM = <<<HTML
+<!doctype html>
+<form id="example-form">
+	<section><h1>Section 1</h1></section>
+	<section><h1>Section 2</h1></section>
+	<section><h1>Section 3</h1></section>
+	<section><h1>Section 4</h1></section>
+</form>
+HTML;
+
 	const HTML_TEXT = <<<HTML
 <p>Thru-hiking is great!  <strong>No insipid election coverage!</strong>
   However, <a href="http://en.wikipedia.org/wiki/Absentee_ballot">casting a
@@ -170,9 +181,9 @@ class Helper {
 </breakfast-menu>
 XML;
 
-	/**
-	 * Below this line is all code that is used in documentation.
-	 */
+/**
+ * Below this line is all code that is used in documentation.
+ */
 
 // https://github.com/PhpGt/Dom/wiki/Classes-that-make-up-DOM#moving-an-attribute-between-elements
 	const DOCS_ATTR_GETATTRIBUTENODE = <<<HTML

diff --git a/test/unit/NodeListTest.php b/test/unit/NodeListTest.php
@@ -36,4 +36,23 @@ public function testNodeListIndexOutOfBounds() {
 
 		self::assertNull($paragraphList[$count]);
 	}
+
+	public function testCountDoesNotBreakIterator() {
+		$document = new HTMLDocument(Helper::HTML_SECTIONS_WITHIN_FORM);
+		$form = $document->getElementById("example-form");
+		$sectionList = $form->querySelectorAll("section");
+		$count = count($sectionList);
+		$actualCount = 0;
+
+		foreach($sectionList as $i => $section) {
+			$actualCount ++;
+			$section->setAttribute(
+				"data-section-count",
+				count($sectionList)
+			);
+		}
+
+		self::assertGreaterThan(1, $actualCount);
+		self::assertEquals($count, $actualCount);
+	}
 }