voku / HtmlMin

src/voku/helper/HtmlMin.php

Doc Comments +2 added lines, -2 removed lines

@@ -482,8 +482,8 @@
   }
 
   /**
-   * @param $html
-   * @param $decodeUtf8Specials
+   * @param string $html
+   * @param boolean $decodeUtf8Specials
    *
    * @return string
    */

Indentation +48 added lines, -48 removed lines

@@ -495,72 +495,72 @@
     return in_array($tag_name, self::$optional_end_tags)
            ||
            (
-               $tag_name == 'li'
+                $tag_name == 'li'
                &&
                (
-                   $nextSibling === null
+                    $nextSibling === null
                    ||
                    (
-                       $nextSibling instanceof \DOMElement
+                        $nextSibling instanceof \DOMElement
                        &&
                        $nextSibling->tagName == $tag_name
-                   )
-               )
-           )
+                    )
+                )
+            )
            ||
            (
-               $tag_name == 'p'
+                $tag_name == 'p'
                &&
                (
-                   (
-                       $nextSibling === null
+                    (
+                        $nextSibling === null
                        &&
                        (
-                           $node->parentNode !== null
+                            $node->parentNode !== null
                            &&
                            $node->parentNode->tagName != 'a'
-                       )
-                   )
+                        )
+                    )
                    ||
                    (
-                       $nextSibling instanceof \DOMElement
+                        $nextSibling instanceof \DOMElement
                        &&
                        in_array(
-                           $nextSibling->tagName,
-                           array(
-                               '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,
+                            array(
+                                '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)

Spacing +29 added lines, -29 removed lines

@@ -450,7 +450,7 @@ 
         # http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#attributes-0
         $omitquotes = $attribute->value != '' && 0 == \preg_match('/["\'=<>` \t\r\n\f]+/', $attribute->value);
         $attr_val = $attribute->value;
-        $attrstr .= ($omitquotes ? '' : '"') . $attr_val . ($omitquotes ? '' : '"');
+        $attrstr .= ($omitquotes ? '' : '"').$attr_val.($omitquotes ? '' : '"');
         $attrstr .= ' ';
       }
     }
@@ -576,11 +576,11 @@ 
 
       } else if ($child instanceof \DOMElement) {
 
-        $htmlstr .= trim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));
-        $htmlstr .= '>' . $this->domNodeToString($child);
+        $htmlstr .= trim('<'.$child->tagName.' '.$this->domNodeAttributesToString($child));
+        $htmlstr .= '>'.$this->domNodeToString($child);
 
         if (!$this->domNodeClosingTagOptional($child)) {
-          $htmlstr .= '</' . $child->tagName . '>';
+          $htmlstr .= '</'.$child->tagName.'>';
         }
 
       } else if ($child instanceof \DOMText) {
@@ -603,7 +603,7 @@ 
 
       } else {
 
-        throw new \Exception('Error by: ' . print_r($child, true));
+        throw new \Exception('Error by: '.print_r($child, true));
 
       }
     }
@@ -653,7 +653,7 @@ 
    */
   public function minify($html, $decodeUtf8Specials = false)
   {
-    $html = (string)$html;
+    $html = (string) $html;
     if (!isset($html[0])) {
       return '';
     }
@@ -689,10 +689,10 @@ 
     // -------------------------------------------------------------------------
 
     // Remove extra white-space(s) between HTML attribute(s)
-    $html = (string)\preg_replace_callback(
+    $html = (string) \preg_replace_callback(
         '#<([^\/\s<>!]+)(?:\s+([^<>]*?)\s*|\s*)(\/?)>#',
-        function ($matches) {
-          return '<' . $matches[1] . (string)\preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]) . $matches[3] . '>';
+        function($matches) {
+          return '<'.$matches[1].(string) \preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]).$matches[3].'>';
         },
         $html
     );
@@ -700,15 +700,15 @@ 
 
     if ($this->doRemoveSpacesBetweenTags === true) {
       // Remove spaces that are between > and <
-      $html = (string)\preg_replace('/(>) (<)/', '>$2', $html);
+      $html = (string) \preg_replace('/(>) (<)/', '>$2', $html);
     }
 
     // -------------------------------------------------------------------------
     // Restore protected HTML-code.
     // -------------------------------------------------------------------------
 
-    $html = (string)\preg_replace_callback(
-        '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>]*)?>(?<value>.*?)<\/' . $this->protectedChildNodesHelper . '>/',
+    $html = (string) \preg_replace_callback(
+        '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>]*)?>(?<value>.*?)<\/'.$this->protectedChildNodesHelper.'>/',
         array($this, 'restoreProtectedHtml'),
         $html
     );
@@ -729,14 +729,14 @@ 
 
     $html = \str_replace(
         array(
-            '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',
         ),
         array(
             'html>',
@@ -755,10 +755,10 @@ 
     $replace = array();
     $replacement = array();
     foreach (self::$selfClosingTags as $selfClosingTag) {
-      $replace[] = '<' . $selfClosingTag . '/>';
-      $replacement[] = '<' . $selfClosingTag . '>';
-      $replace[] = '<' . $selfClosingTag . ' />';
-      $replacement[] = '<' . $selfClosingTag . '>';
+      $replace[] = '<'.$selfClosingTag.'/>';
+      $replacement[] = '<'.$selfClosingTag.'>';
+      $replace[] = '<'.$selfClosingTag.' />';
+      $replacement[] = '<'.$selfClosingTag.'>';
     }
     $html = \str_replace(
         $replace,
@@ -861,7 +861,7 @@ 
     }
 
     $attrs = array();
-    foreach ((array)$attributes as $attrName => $attrValue) {
+    foreach ((array) $attributes as $attrName => $attrValue) {
 
       if (isset(self::$booleanAttributes[$attrName])) {
         continue;
@@ -940,7 +940,7 @@ 
       }
 
       $this->protectedChildNodes[$counter] = $element->text();
-      $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
+      $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
 
       ++$counter;
     }
@@ -955,11 +955,11 @@ 
         continue;
       }
 
-      $this->protectedChildNodes[$counter] = '<!--' . $text . '-->';
+      $this->protectedChildNodes[$counter] = '<!--'.$text.'-->';
 
       /* @var $node \DOMComment */
       $node = $element->getNode();
-      $child = new \DOMText('<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>');
+      $child = new \DOMText('<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>');
       $element->getNode()->parentNode->replaceChild($child, $node);
 
       ++$counter;
@@ -1156,7 +1156,7 @@ 
         continue;
       }
 
-      $attrValue .= \trim($class) . ' ';
+      $attrValue .= \trim($class).' ';
     }
     $attrValue = \trim($attrValue);