String comparisons are now strict where possible.

Author: hexydec

composer.lock

@@ -291,7 +291,6 @@ protected function parseSelector(string $selector) {
 			$join = null;
 			do {
 				switch ($token['type']) {
-
 					case 'id':
 						$parts[] = [
 							'id' => mb_substr($token['value'], 1),
@@ -319,14 +318,14 @@ protected function parseSelector(string $selector) {
 					case 'squareopen':
 						$item = ['join' => $join];
 						while (($token = $tokens->next()) !== false) {
-							if ($token['type'] == 'squareclose') {
+							if ($token['type'] === 'squareclose') {
 								break;
 							} 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') {
+							} elseif ($token['type'] === 'comparison') {
 								$item['comparison'] = $token['value'];
 							}
 						}
@@ -401,7 +400,7 @@ public function get(int $index = null) {
 		// build children that are tags
 		$children = [];
 		foreach ($this->children AS $item) {
-			if (get_class($item) == 'hexydec\\html\\tag') {
+			if (get_class($item) === 'hexydec\\html\\tag') {
 				$children[] = $item;
 			}
 		}
@@ -435,7 +434,7 @@ public function find(string $selector) : htmldoc {
 		// parse selector and find tags
 		if (is_array($selector) || ($selector = $this->parseSelector($selector)) !== false) {
 			foreach ($this->children AS $item) {
-				if (get_class($item) == 'hexydec\\html\\tag') {
+				if (get_class($item) === 'hexydec\\html\\tag') {
 					foreach ($selector AS $value) {
 						if (($items = $item->find($value)) !== false) {
 							$found = array_merge($found, $items);
@@ -505,7 +504,7 @@ public function children() : htmldoc {
 	 */
 	public function attr(string $key) : ?string {
 		foreach ($this->children AS $item) {
-			if (get_class($item) == 'hexydec\\html\\tag') {
+			if (get_class($item) === 'hexydec\\html\\tag') {
 				return $item->attr($key);
 			}
 		}
@@ -522,7 +521,7 @@ public function text() : string {
 		foreach ($this->children AS $item) {
 
 			// only get text from these objects
-			if (in_array(get_class($item), ['hexydec\\html\\tag', 'hexydec\\html\\text'])) {
+			if (in_array(get_class($item), ['hexydec\\html\\tag', 'hexydec\\html\\text'], true)) {
 				$value = $item->text();
 				$text = array_merge($text, is_array($value) ? $value : [$value]);
 			}
@@ -635,7 +634,7 @@ public function save(string $file = null, array $options = []) {
 		if (!empty($options['charset'])) {
 
 			// if not UTF-8, convert all applicable HTML entities
-			if ($options['charset'] != 'UTF-8') {
+			if ($options['charset'] !== 'UTF-8') {
 				$html = $this->htmlentities($html, $options['charset']);
 			}
 

src/htmldoc.php

@@ -39,7 +39,7 @@ public function parse(tokenise $tokens) : void {
 	 * @return void
 	 */
 	public function minify(array $minify) : void {
-		if (!empty($minify['comments']['remove']) && (empty($minify['comments']['ie']) || (mb_strpos($this->content, '[if ') !== 0 && $this->content != '<![endif]'))) {
+		if (!empty($minify['comments']['remove']) && (empty($minify['comments']['ie']) || (mb_strpos($this->content, '[if ') !== 0 && $this->content !== '<![endif]'))) {
 			$this->content = null;
 		}
 	}

src/tokens/comment.php

@@ -28,8 +28,8 @@ public function __construct(htmldoc $root) {
 	 */
 	public function parse(tokenise $tokens) : void {
 		$content = '';
-		while (($token = $tokens->next()) !== null && $token['type'] != 'tagopenend') {
-			if ($token['type'] == 'attribute') {
+		while (($token = $tokens->next()) !== null && $token['type'] !== 'tagopenend') {
+			if ($token['type'] === 'attribute') {
 				$content .= ($content ? ' ' : '').ltrim($token['value']);
 			}
 		}

src/tokens/doctype.php

@@ -37,21 +37,6 @@ public function parse(tokenise $tokens) : void {
 			$this->content = $token[0];
 			return;
 		}
-		// if (($token = $tokens->current()) !== null) {
-		// 	$value = '';
-		// 	while ($token !== null && ($token['type'] != 'tagclose' || $token['value'] != '</style>')) {
-		// 		if ($token['type'] == 'cdata') {
-		// 			$value .= mb_substr($token['value'], 9, -3);
-		// 		} else {
-		// 			$value .= $token['value'];
-		// 		}
-		// 		$token = $tokens->next();
-		// 	}
-		// 	$tokens->prev();
-		// 	if ($value) {
-		// 		$this->content = $value;
-		// 	}
-		// }
 	}
 
 	/**

src/tokens/style.php

@@ -120,7 +120,7 @@ public function parse(tokenise $tokens) : void {
 					}
 
 				case 'tagselfclose':
-					if (in_array($tag, $this->config['elements']['singleton'])) {
+					if (in_array($tag, $this->config['elements']['singleton'], true)) {
 						$this->singleton = $token['value'];
 					}
 					break 2;
@@ -132,7 +132,7 @@ public function parse(tokenise $tokens) : void {
 					if (in_array($close, $this->getParentTagNames())) {
 
 						// when it is not our tag, pass it to the parent to handle
-						if ($close != $tag) {
+						if ($close !== $tag) {
 							$tokens->prev();
 
 						// otherwise we are closing ourself