voku / HtmlMin

src/voku/helper/HtmlMin.php

Indentation +115 added lines, -115 removed lines

@@ -778,206 +778,206 @@ 
         return \in_array($tag_name, self::$optional_end_tags, true)
                ||
                (
-                   $tag_name === 'li'
+                    $tag_name === 'li'
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            $nextSibling->tagName === 'li'
-                       )
-                   )
-               )
+                        )
+                    )
+                )
                ||
                (
-                   $tag_name === 'rp'
+                    $tag_name === 'rp'
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            (
-                               $nextSibling->tagName === 'rp'
+                                $nextSibling->tagName === 'rp'
                                ||
                                $nextSibling->tagName === 'rt'
-                           )
-                       )
-                   )
-               )
+                            )
+                        )
+                    )
+                )
                ||
                (
-                   $tag_name === 'tr'
+                    $tag_name === 'tr'
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            $nextSibling->tagName === 'tr'
-                       )
-                   )
-               )
+                        )
+                    )
+                )
                ||
                (
-                   $tag_name === 'source'
+                    $tag_name === 'source'
                    &&
                    (
-                       $parent_tag_name === 'audio'
+                        $parent_tag_name === 'audio'
                        ||
                        $parent_tag_name === 'video'
                        ||
                        $parent_tag_name === 'picture'
                        ||
                        $parent_tag_name === 'source'
-                   )
+                    )
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            $nextSibling->tagName === 'source'
-                       )
-                   )
-               )
+                        )
+                    )
+                )
                ||
                (
-                   (
-                       $tag_name === 'td'
+                    (
+                        $tag_name === 'td'
                        ||
                        $tag_name === 'th'
-                   )
+                    )
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            (
-                               $nextSibling->tagName === 'td'
+                                $nextSibling->tagName === 'td'
                                ||
                                $nextSibling->tagName === 'th'
-                           )
-                       )
-                   )
-               )
+                            )
+                        )
+                    )
+                )
                ||
                (
-                   (
-                       $tag_name === 'dd'
+                    (
+                        $tag_name === 'dd'
                        ||
                        $tag_name === 'dt'
-                   )
+                    )
                    &&
                    (
-                       (
-                           $nextSibling === null
+                        (
+                            $nextSibling === null
                            &&
                            $tag_name === 'dd'
-                       )
+                        )
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            (
-                               $nextSibling->tagName === 'dd'
+                                $nextSibling->tagName === 'dd'
                                ||
                                $nextSibling->tagName === 'dt'
-                           )
-                       )
-                   )
-               )
+                            )
+                        )
+                    )
+                )
                ||
                (
-                   $tag_name === 'option'
+                    $tag_name === 'option'
                    &&
                    (
-                       $nextSibling === null
+                        $nextSibling === null
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            (
-                               $nextSibling->tagName === 'option'
+                                $nextSibling->tagName === 'option'
                                ||
                                $nextSibling->tagName === 'optgroup'
-                           )
-                       )
-                   )
-               )
+                            )
+                        )
+                    )
+                )
                ||
                (
-                   $tag_name === 'p'
+                    $tag_name === 'p'
                    &&
                    (
-                       (
-                           $nextSibling === null
+                        (
+                            $nextSibling === null
                            &&
                            (
-                               $node->parentNode !== null
+                                $node->parentNode !== null
                                &&
                                !\in_array(
-                                   $node->parentNode->nodeName,
-                                   [
-                                       'a',
-                                       'audio',
-                                       'del',
-                                       'ins',
-                                       'map',
-                                       'noscript',
-                                       'video',
-                                   ],
-                                   true
-                               )
-                           )
-                       )
+                                    $node->parentNode->nodeName,
+                                    [
+                                        'a',
+                                        'audio',
+                                        'del',
+                                        'ins',
+                                        'map',
+                                        'noscript',
+                                        'video',
+                                    ],
+                                    true
+                                )
+                            )
+                        )
                        ||
                        (
-                           $nextSibling instanceof \DOMElement
+                            $nextSibling instanceof \DOMElement
                            &&
                            \in_array(
-                               $nextSibling->tagName,
-                               [
-                                   'address',
-                                   'article',
-                                   'aside',
-                                   'blockquote',
-                                   'dir',
-                                   'div',
-                                   'dl',
-                                   'fieldset',
-                                   'footer',
-                                   'form',
-                                   'h1',
-                                   'h2',
-                                   'h3',
-                                   'h4',
-                                   'h5',
-                                   'h6',
-                                   'header',
-                                   'hgroup',
-                                   'hr',
-                                   'menu',
-                                   'nav',
-                                   'ol',
-                                   'p',
-                                   'pre',
-                                   'section',
-                                   'table',
-                                   'ul',
-                               ],
-                               true
-                           )
-                       )
-                   )
-               );
+                                $nextSibling->tagName,
+                                [
+                                    'address',
+                                    'article',
+                                    'aside',
+                                    'blockquote',
+                                    'dir',
+                                    'div',
+                                    'dl',
+                                    'fieldset',
+                                    'footer',
+                                    'form',
+                                    'h1',
+                                    'h2',
+                                    'h3',
+                                    'h4',
+                                    'h5',
+                                    'h6',
+                                    'header',
+                                    'hgroup',
+                                    'hr',
+                                    'menu',
+                                    'nav',
+                                    'ol',
+                                    'p',
+                                    'pre',
+                                    'section',
+                                    'table',
+                                    'ul',
+                                ],
+                                true
+                            )
+                        )
+                    )
+                );
     }
 
     protected function domNodeToString(\DOMNode $node): string
@@ -1009,9 +1009,9 @@ 
                     }
 
                     $html .= '<!DOCTYPE ' . $child->name . ''
-                             . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
-                             . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
-                             . '>';
+                              . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
+                              . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
+                              . '>';
                 }
             } elseif ($child instanceof \DOMElement) {
                 $html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));

Doc Comments +1 added lines, -1 removed lines

@@ -1187,7 +1187,7 @@
     /**
      * @param \DOMNode $node
      *
-     * @return \DOMNode|null
+     * @return null|\DOMElement
      */
     protected function getNextSiblingOfTypeDOMElement(\DOMNode $node)
     {

Spacing +28 added lines, -28 removed lines

@@ -572,7 +572,7 @@ 
                     $attr_val = $attribute->value;
                 }
 
-                $attr_str .= ($omit_quotes ? '' : $quoteTmp) . $attr_val . ($omit_quotes ? '' : $quoteTmp);
+                $attr_str .= ($omit_quotes ? '' : $quoteTmp).$attr_val.($omit_quotes ? '' : $quoteTmp);
                 $attr_str .= ' ';
             }
         }
@@ -869,21 +869,21 @@ 
                         $tmpTypePublic = 'PUBLIC';
                     }
 
-                    $html .= '<!DOCTYPE ' . $child->name . ''
-                             . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
-                             . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
+                    $html .= '<!DOCTYPE '.$child->name.''
+                             . ($child->publicId ? ' '.$tmpTypePublic.' "'.$child->publicId.'"' : '')
+                             . ($child->systemId ? ' '.$tmpTypeSystem.' "'.$child->systemId.'"' : '')
                              . '>';
                 }
             } elseif ($child instanceof \DOMElement) {
-                $html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));
-                $html .= '>' . $this->domNodeToString($child);
+                $html .= \rtrim('<'.$child->tagName.' '.$this->domNodeAttributesToString($child));
+                $html .= '>'.$this->domNodeToString($child);
 
                 if (
                     !$this->doRemoveOmittedHtmlTags
                     ||
                     !$this->domNodeClosingTagOptional($child)
                 ) {
-                    $html .= '</' . $child->tagName . '>';
+                    $html .= '</'.$child->tagName.'>';
                 }
 
                 if (!$this->doRemoveWhitespaceAroundTags) {
@@ -947,7 +947,7 @@ 
                     $html .= $child->wholeText;
                 }
             } elseif ($child instanceof \DOMComment) {
-                $html .= '<!--' . $child->textContent . '-->';
+                $html .= '<!--'.$child->textContent.'-->';
             }
         }
 
@@ -1155,8 +1155,8 @@ 
         if (\strpos($html, ' ') !== false) {
             $html = (string) \preg_replace_callback(
                 '#<([^/\s<>!]+)(?:\s+([^<>]*?)\s*|\s*)(/?)>#',
-                static function ($matches) {
-                    return '<' . $matches[1] . \preg_replace('#([^\s=]+)(=([\'"]?)(.*?)\3)?(\s+|$)#su', ' $1$2', $matches[2]) . $matches[3] . '>';
+                static function($matches) {
+                    return '<'.$matches[1].\preg_replace('#([^\s=]+)(=([\'"]?)(.*?)\3)?(\s+|$)#su', ' $1$2', $matches[2]).$matches[3].'>';
                 },
                 $html
             );
@@ -1176,7 +1176,7 @@ 
 
         if (\strpos($html, $this->protectedChildNodesHelper) !== false) {
             $html = (string) \preg_replace_callback(
-                '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>]*)?>(?<value>.*?)<\/' . $this->protectedChildNodesHelper . '>/',
+                '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>]*)?>(?<value>.*?)<\/'.$this->protectedChildNodesHelper.'>/',
                 [$this, 'restoreProtectedHtml'],
                 $html
             );
@@ -1196,14 +1196,14 @@ 
 
         $html = \str_replace(
             [
-                'html>' . "\n",
-                "\n" . '<html',
-                'html/>' . "\n",
-                "\n" . '</html',
-                'head>' . "\n",
-                "\n" . '<head',
-                'head/>' . "\n",
-                "\n" . '</head',
+                'html>'."\n",
+                "\n".'<html',
+                'html/>'."\n",
+                "\n".'</html',
+                'head>'."\n",
+                "\n".'<head',
+                'head/>'."\n",
+                "\n".'</head',
             ],
             [
                 'html>',
@@ -1222,11 +1222,11 @@ 
         $replace = [];
         $replacement = [];
         foreach (self::$selfClosingTags as $selfClosingTag) {
-            $replace[] = '<' . $selfClosingTag . '/>';
-            $replacement[] = '<' . $selfClosingTag . '>';
-            $replace[] = '<' . $selfClosingTag . ' />';
-            $replacement[] = '<' . $selfClosingTag . '>';
-            $replace[] = '></' . $selfClosingTag . '>';
+            $replace[] = '<'.$selfClosingTag.'/>';
+            $replacement[] = '<'.$selfClosingTag.'>';
+            $replace[] = '<'.$selfClosingTag.' />';
+            $replacement[] = '<'.$selfClosingTag.'>';
+            $replace[] = '></'.$selfClosingTag.'>';
             $replacement[] = '>';
         }
         $html = \str_replace(
@@ -1417,7 +1417,7 @@ 
             $this->protectedChildNodes[$this->protected_tags_counter] = $element->parentNode()->innerHtml();
             $parentNode = $element->getNode()->parentNode;
             if ($parentNode !== null) {
-                $parentNode->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $this->protected_tags_counter . '"></' . $this->protectedChildNodesHelper . '>';
+                $parentNode->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$this->protected_tags_counter.'"></'.$this->protectedChildNodesHelper.'>';
             }
 
             ++$this->protected_tags_counter;
@@ -1451,7 +1451,7 @@ 
             }
 
             $this->protectedChildNodes[$this->protected_tags_counter] = $element->innerhtml;
-            $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $this->protected_tags_counter . '"></' . $this->protectedChildNodesHelper . '>';
+            $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$this->protected_tags_counter.'"></'.$this->protectedChildNodesHelper.'>';
 
             ++$this->protected_tags_counter;
         }
@@ -1468,11 +1468,11 @@ 
                 continue;
             }
 
-            $this->protectedChildNodes[$this->protected_tags_counter] = '<!--' . $text . '-->';
+            $this->protectedChildNodes[$this->protected_tags_counter] = '<!--'.$text.'-->';
 
             /* @var $node \DOMComment */
             $node = $element->getNode();
-            $child = new \DOMText('<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $this->protected_tags_counter . '"></' . $this->protectedChildNodesHelper . '>');
+            $child = new \DOMText('<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$this->protected_tags_counter.'"></'.$this->protectedChildNodesHelper.'>');
             $parentNode = $element->getNode()->parentNode;
             if ($parentNode !== null) {
                 $parentNode->replaceChild($child, $node);

src/voku/helper/HtmlMinDomObserverOptimizeAttributes.php

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
                 $attrName === 'action'
             )
         ) {
-            $attrValue = \str_replace($scheme . '://', '//', $attrValue);
+            $attrValue = \str_replace($scheme.'://', '//', $attrValue);
         }
 
         return $attrValue;
@@ -293,7 +293,7 @@ 
                 continue;
             }
 
-            $attrValue .= \trim($class) . ' ';
+            $attrValue .= \trim($class).' ';
         }
 
         return \trim($attrValue);