Merge branch 'master' of github.com:hexydec/htmldoc

Author: hexydec

src/htmldoc.php

@@ -341,15 +341,21 @@ protected function parseSelector(tokenise $tokens) {
 						break;
 
 					case 'squareopen':
-						$item = ['join' => $join];
+						$item = ['join' => $join, 'sensitive' => true];
 						while (($token = $tokens->next()) !== null) {
 							if ($token['type'] === 'squareclose') {
 								break;
 							} elseif (\in_array($token['type'], ['string', 'quotes'], true)) {
 								if ($token['type'] === 'quotes') {
 									$token['value'] = \stripslashes(\mb_substr($token['value'], 1, -1));
 								}
-								$item[isset($item['attribute']) ? 'value' : 'attribute'] = $token['value'];
+								if (!isset($item['attribute'])) {
+									$item['attribute'] = $token['value'];
+								} elseif (!isset($item['value'])) {
+									$item['value'] = $token['value'];
+								} elseif ($token['value'] === 'i') {
+									$item['sensitive'] = false;
+								}
 							} elseif ($token['type'] === 'comparison') {
 								$item['comparison'] = $token['value'];
 							}

src/tokens/tag.php

@@ -329,6 +329,11 @@ public function prepend(array $nodes) : void {
 		}
 	}
 
+	/**
+	 * Retrieve the index position of the current element in the parent
+	 *
+	 * @return int|null The index of the current element with the parent, or null if there is no parent
+	 */
 	protected function getIndex() : ?int {
 		foreach ($this->parent->children() AS $key => $item) {
 			if ($item === $this) {
@@ -664,35 +669,56 @@ public function find(array $selector, bool $searchChildren = true) : array {
 					$match = false;
 					break;
 				} elseif (!empty($item['value'])) {
+					$current = $this->attributes[$item['attribute']];
 					switch ($item['comparison']) {
 
 						// exact match
 						case '=':
-							if ($this->attributes[$item['attribute']] !== $item['value']) {
+							if ($item['sensitive']) {
+								if ($current !== $item['value']) {
+									$match = false;
+									break;
+								}
+							} elseif (\mb_strtolower($current) !== \mb_strtolower($item['value'])) {
 								$match = false;
 								break;
 							}
 							break;
 
 						// match start
 						case '^=':
-							if (\mb_strpos($this->attributes[$item['attribute']], $item['value']) !== 0) {
+							if ($item['sensitive']) {
+								if (\mb_strpos($current, $item['value']) !== 0) {
+									$match = false;
+									break;
+								}
+							} elseif (\mb_stripos($current, $item['value']) !== 0) {
 								$match = false;
 								break;
 							}
 							break;
 
 						// match within
 						case '*=':
-							if (\mb_strpos($this->attributes[$item['attribute']], $item['value']) === false) {
+							if ($item['sensitive']) {
+								if (\mb_strpos($current, $item['value']) === false) {
+									$match = false;
+									break;
+								}
+							} elseif (\mb_stripos($current, $item['value']) === false) {
 								$match = false;
 								break;
 							}
 							break;
 
 						// match end
 						case '$=':
-							if (\mb_strpos($this->attributes[$item['attribute']], $item['value']) !== \mb_strlen($this->attributes[$item['attribute']]) - \mb_strlen($item['value'])) {
+							if ($item['sensitive']) {
+								if (\mb_strpos($current, $item['value']) !== \mb_strlen($current) - \mb_strlen($item['value'])) {
+									$match = false;
+									break;
+								}
+							} elseif (\mb_stripos($current, $item['value']) !== \mb_strlen($current) - \mb_strlen($item['value'])) {
 								$match = false;
 								break;
 							}

tests/findHtmldocTest.php

@@ -31,6 +31,8 @@ public function testCanFindElements() {
 				'html h1[class$=heading]' => '<h1 class="find__heading">Heading</h1>',
 				'a[href$="://github.com/hexydec/htmldoc/"]' => '<a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>',
 				'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>',
 				'div:first-child' => '<div id="first" class="first">First</div>',
 				// '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>',