[+]: fix logic of detecting next sibling dom node v2

-> style + phpstan fixes
voku · Apr 6, 2020 · 8e72ae1 · 8e72ae1
1 parent 67d39fb
commit 8e72ae1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/voku/helper/HtmlMin.php b/src/voku/helper/HtmlMin.php
@@ -913,6 +913,8 @@ private function domNodeClosingTagOptional(\DOMNode $node): bool
                        (
                            $nextSibling === null
                            &&
+                           $node->parentNode !== null
+                           &&
                            !\in_array(
                                $node->parentNode->nodeName,
                                [
@@ -1460,7 +1462,7 @@ static function ($matches) {
     protected function getNextSiblingOfTypeDOMElement(\DOMNode $node)
     {
         do {
-            /** @var \DOMNode|null $node - false-positive error from phpstan */
+            /** @var \DOMNode|null $nodeTmp - false-positive error from phpstan */
             $nodeTmp = $node->nextSibling;
 
             if ($nodeTmp instanceof \DOMText) {
@@ -1471,12 +1473,11 @@ protected function getNextSiblingOfTypeDOMElement(\DOMNode $node)
                 ) {
                     $node = $nodeTmp;
                 } else {
-                    $node = $nodeTmp ? $nodeTmp->nextSibling : null;
+                    $node = $nodeTmp->nextSibling;
                 }
             } else {
                 $node = $nodeTmp;
             }
-
         } while (!($node === null || $node instanceof \DOMElement || $node instanceof \DOMText));
 
         return $node;