Added ability to handle sibling selectors to tag::find().

Updated htmldoc::collection() to only store unique tags, as sibling `find()` operations can produce the same node multiple times.

Author: hexydec

src/htmldoc.php

@@ -490,7 +490,15 @@ public function text() : string {
 	 * @return void
 	 */
 	protected function collection(array $nodes) : void {
-		$this->children = $nodes;
+
+		// only store unique nodes as some find operations can produce the same node multiple times
+		$unique = [];
+		foreach ($nodes AS $item) {
+			if (!\in_array($item, $unique, true)) {
+				$unique[] = $item;
+			}
+		}
+		$this->children = $unique;
 	}
 
 	/**

src/tokens/tag.php

@@ -641,7 +641,7 @@ public function find(array $selector, bool $searchChildren = true) : array {
 			}
 
 			// pass rest of selector to level below
-			if ($item['join'] && $i) {
+			if (\in_array($item['join'], [' ', '>'], true) && $i) {
 				$match = false;
 				$childselector = \array_slice($selector, $i);
 				foreach ($this->children AS $child) {
@@ -651,6 +651,23 @@ public function find(array $selector, bool $searchChildren = true) : array {
 				}
 				break;
 
+			// find siblings
+			} elseif (\in_array($item['join'], ['+', '~'], true) && $i) {
+				$match = false;
+				$siblingselector = \array_slice($selector, $i);
+				$search = false;
+				foreach ($this->parent->children AS $sibling) {
+					if (!$search && $sibling === $this) {
+						$search = true;
+					} elseif ($search && \get_class($sibling) === 'hexydec\\html\\tag') {
+						$found = \array_merge($found, $sibling->find($siblingselector));
+						if ($item['join'] === '+') {
+							break;
+						}
+					}
+				}
+				break;
+
 			// match tag
 			} elseif (!empty($item['tag']) && $item['tag'] !== '*') {
 				if ($item['tag'] !== $this->tagName) {

tests/findHtmldocTest.php

@@ -19,9 +19,23 @@ public function testCanFindElements() {
 			$this->assertEquals($doc->length, 4, 'Can count elements');
 			// var_dump($doc->find('title'));
 			$tests = [
+
+				// basic selectors
 				'title' => '<title>Find</title>',
 				'.find' => '<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p><a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a></div>',
 				'#first' => '<div id="first" class="first">First</div>',
+				'.first, .find__heading, .find__paragraph' => '<div id="first" class="first">First</div><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
+
+				// combination selectors
+				'body .find__paragraph' => '<p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
+				'body > .find__paragraph' => null,
+				'.find > .find__paragraph' => '<p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
+				'.find__paragraph + a' => '<a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>',
+				'div[data-attr] ~ div' => '<div data-attr="">attr</div><div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div><div data-word="one two three four">attr</div>',
+				'.find h1 ~ a' => '<a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>',
+				'.attributes div ~ div' => '<div data-attr="">attr</div><div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div><div data-word="one two three four">attr</div>',
+
+				// attribute selectors
 				'#first[class]' => '<div id="first" class="first">First</div>',
 				'[class=first]' => '<div id="first" class="first">First</div>',
 				'[class^=find]' => '<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p><a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a></div><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p><a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>',
@@ -34,18 +48,16 @@ public function testCanFindElements() {
 				'a[href$="://github.com/hexydec/htmldoc"]' => null,
 				'a[href$="://github.com/Hexydec/Htmldoc/"]' => null,
 				'a[href$="://github.com/Hexydec/Htmldoc/" i]' => '<a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>',
+				'[data-attr]' => '<div data-attr>attr</div><div data-attr="">attr</div><div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div>',
+				'[data-attr|=attr]' => '<div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div>',
+				'[data-word~=three]' => '<div data-word="one two three four">attr</div>',
+
+				// pseudo selectors
 				'.positions div:first-child' => '<div id="first" class="first">First</div>',
 				'.positions div:last-child' => '<div class="last">Last</div>',
-				'.first, .find__heading, .find__paragraph' => '<div id="first" class="first">First</div><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
-				'body .find__paragraph' => '<p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
-				'body > .find__paragraph' => null,
-				'.find > .find__paragraph' => '<p class="find__paragraph" title="This is a paragraph">Paragraph</p>',
 				'title:not([class])' => '<title>Find</title>',
 				'.positions div:not(.find)' => '<div id="first" class="first">First</div><div class="last">Last</div>',
 				'body section:not(:first-child) div:last-child' => '<div data-word="one two three four">attr</div>',
-				'[data-attr]' => '<div data-attr>attr</div><div data-attr="">attr</div><div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div>',
-				'[data-attr|=attr]' => '<div data-attr="attr">attr</div><div data-attr="attr-value1">attr</div><div data-attr="attr-value2">attr</div>',
-				'[data-word~=three]' => '<div data-word="one two three four">attr</div>'
 			];
 			foreach ($tests AS $key => $item) {
 				$this->assertEquals($item, $doc->find($key)->html());