Fixed bug in htmldoc::parseSelector() where it couldn't handle quoted attribute values.

Author: hexydec

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minify",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "A token based HTML Document parser and minifier written in PHP",
   "main": "index.js",
   "directories": {

src/htmldoc/htmldoc.php

@@ -336,7 +336,10 @@ protected static function parseSelector(string $selector) {
 						while (($token = next($tokens)) !== false) {
 							if ($token['type'] == 'squareclose') {
 								break;
-							} elseif ($token['type'] == 'string') {
+							} elseif (in_array($token['type'], ['string', 'quotes'])) {
+								if ($token['type'] == 'quotes') {
+									$token['value'] = stripslashes(mb_substr($token['value'], 1, -1));
+								}
 								$item[isset($item['attribute']) ? 'value' : 'attribute'] = $token['value'];
 							} elseif ($token['type'] == 'comparison') {
 								$item['comparison'] = $token['value'];

tests/findHtmldocTest.php

@@ -19,14 +19,16 @@ public function testCanFindElements() {
 			$this->assertEquals($doc->length, 4, 'Can count elements');
 			// var_dump($doc->find('title'));
 			$this->assertEquals('<title>Find</title>', $doc->find('title')->html());
-			$this->assertEquals('<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p></div>', $doc->find('.find')->html());
+			$this->assertEquals('<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>', $doc->find('.find')->html());
 			$this->assertEquals('<div id="first" class="first">First</div>', $doc->find('#first')->html());
 			$this->assertEquals('<div id="first" class="first">First</div>', $doc->find('[class=first]')->html());
-			$this->assertEquals('<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p></div><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p>', $doc->find('[class^=find]')->html());
-			$this->assertEquals('<h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p>', $doc->find('[class*=__]')->html());
+			$this->assertEquals('<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>', $doc->find('[class^=find]')->html());
+			$this->assertEquals('<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>', $doc->find('[class*=__]')->html());
 			$this->assertEquals('<h1 class="find__heading">Heading</h1>', $doc->find('[class$=heading]')->html());
 			$this->assertEquals('<h1 class="find__heading">Heading</h1>', $doc->find('h1[class$=heading]')->html());
 			$this->assertEquals('<h1 class="find__heading">Heading</h1>', $doc->find('html h1[class$=heading]')->html());
+			$this->assertEquals('<a class="find__anchor" href="https://github.com/hexydec/htmldoc/">Anchor</a>', $doc->find('a[href$="://github.com/hexydec/htmldoc/"]')->html());
+			$this->assertEquals(null, $doc->find('a[href$="://github.com/hexydec/htmldoc"]')->html());
 			$this->assertEquals('<div id="first" class="first">First</div>', $doc->find('div:first-child')->html());
 			$this->assertEquals('<div class="last">Last</div>', $doc->find('div:last-child')->html());
 			$this->assertEquals('<div id="first" class="first">First</div><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p>', $doc->find('.first, .find__heading, .find__paragraph')->html());
@@ -51,9 +53,9 @@ public function testCanTraverseElements() {
 
 			$this->assertEquals('<div id="first" class="first">First</div>', $doc->find('body > *')->first()->html(), 'Can find first element');
 			$this->assertEquals('<div class="last">Last</div>', $doc->find('body > *')->last()->html(), 'Can find last element');
-			$this->assertEquals('<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p></div>', $doc->find('body > *')->eq(1)->html(), 'Can specific element');
-			$this->assertEquals('<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p></div>', $doc->find('body > *')->eq(-2)->html(), 'Can specific element');
-			$this->assertEquals('<div class="find"><h1 class="find__heading">Heading</h1><p class="find__paragraph" title="This is a paragraph">Paragraph</p></div>', $doc->find('.find')->children()->html(), 'Can specific element');
+			$this->assertEquals('<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>', $doc->find('body > *')->eq(1)->html(), 'Can specific element');
+			$this->assertEquals('<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>', $doc->find('body > *')->eq(-2)->html(), 'Can specific element');
+			$this->assertEquals('<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>', $doc->find('.find')->children()->html(), 'Can specific element');
 
 			$this->assertEquals(3, count($doc->find('body > *')->get()));
 			$this->assertEquals('<div class="last">Last</div>', $doc->find('body > *')->get(2)->html());

tests/templates/find.html

@@ -8,6 +8,7 @@
 		<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>
 		<div class="last">Last</div>
 	</body>