Completed
Pull Request — master (#10)
by Lars
01:24
created
src/voku/helper/HtmlMin.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace voku\helper;
6 6
 
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
         # http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#attributes-0
453 453
         $omitquotes = $attribute->value != '' && 0 == \preg_match('/["\'=<>` \t\r\n\f]+/', $attribute->value);
454 454
         $attr_val = $attribute->value;
455
-        $attrstr .= ($omitquotes ? '' : '"') . $attr_val . ($omitquotes ? '' : '"');
455
+        $attrstr .= ($omitquotes ? '' : '"').$attr_val.($omitquotes ? '' : '"');
456 456
         $attrstr .= ' ';
457 457
       }
458 458
     }
@@ -578,11 +578,11 @@  discard block
 block discarded – undo
578 578
 
579 579
       } elseif ($child instanceof \DOMElement) {
580 580
 
581
-        $htmlstr .= trim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));
582
-        $htmlstr .= '>' . $this->domNodeToString($child);
581
+        $htmlstr .= trim('<'.$child->tagName.' '.$this->domNodeAttributesToString($child));
582
+        $htmlstr .= '>'.$this->domNodeToString($child);
583 583
 
584 584
         if (!$this->domNodeClosingTagOptional($child)) {
585
-          $htmlstr .= '</' . $child->tagName . '>';
585
+          $htmlstr .= '</'.$child->tagName.'>';
586 586
         }
587 587
 
588 588
       } elseif ($child instanceof \DOMText) {
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 
606 606
       } else {
607 607
 
608
-        throw new \Exception('Error by: ' . print_r($child, true));
608
+        throw new \Exception('Error by: '.print_r($child, true));
609 609
 
610 610
       }
611 611
     }
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
    */
661 661
   public function minify($html, $decodeUtf8Specials = false): string
662 662
   {
663
-    $html = (string)$html;
663
+    $html = (string) $html;
664 664
     if (!isset($html[0])) {
665 665
       return '';
666 666
     }
@@ -696,10 +696,10 @@  discard block
 block discarded – undo
696 696
     // -------------------------------------------------------------------------
697 697
 
698 698
     // Remove extra white-space(s) between HTML attribute(s)
699
-    $html = (string)\preg_replace_callback(
699
+    $html = (string) \preg_replace_callback(
700 700
         '#<([^\/\s<>!]+)(?:\s+([^<>]*?)\s*|\s*)(\/?)>#',
701
-        function ($matches) {
702
-          return '<' . $matches[1] . (string)\preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]) . $matches[3] . '>';
701
+        function($matches) {
702
+          return '<'.$matches[1].(string) \preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]).$matches[3].'>';
703 703
         },
704 704
         $html
705 705
     );
@@ -707,15 +707,15 @@  discard block
 block discarded – undo
707 707
 
708 708
     if ($this->doRemoveSpacesBetweenTags === true) {
709 709
       // Remove spaces that are between > and <
710
-      $html = (string)\preg_replace('/(>) (<)/', '>$2', $html);
710
+      $html = (string) \preg_replace('/(>) (<)/', '>$2', $html);
711 711
     }
712 712
 
713 713
     // -------------------------------------------------------------------------
714 714
     // Restore protected HTML-code.
715 715
     // -------------------------------------------------------------------------
716 716
 
717
-    $html = (string)\preg_replace_callback(
718
-        '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>]*)?>(?<value>.*?)<\/' . $this->protectedChildNodesHelper . '>/',
717
+    $html = (string) \preg_replace_callback(
718
+        '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>]*)?>(?<value>.*?)<\/'.$this->protectedChildNodesHelper.'>/',
719 719
         [$this, 'restoreProtectedHtml'],
720 720
         $html
721 721
     );
@@ -736,14 +736,14 @@  discard block
 block discarded – undo
736 736
 
737 737
     $html = \str_replace(
738 738
         [
739
-            'html>' . "\n",
740
-            "\n" . '<html',
741
-            'html/>' . "\n",
742
-            "\n" . '</html',
743
-            'head>' . "\n",
744
-            "\n" . '<head',
745
-            'head/>' . "\n",
746
-            "\n" . '</head',
739
+            'html>'."\n",
740
+            "\n".'<html',
741
+            'html/>'."\n",
742
+            "\n".'</html',
743
+            'head>'."\n",
744
+            "\n".'<head',
745
+            'head/>'."\n",
746
+            "\n".'</head',
747 747
         ],
748 748
         [
749 749
             'html>',
@@ -762,10 +762,10 @@  discard block
 block discarded – undo
762 762
     $replace = [];
763 763
     $replacement = [];
764 764
     foreach (self::$selfClosingTags as $selfClosingTag) {
765
-      $replace[] = '<' . $selfClosingTag . '/>';
766
-      $replacement[] = '<' . $selfClosingTag . '>';
767
-      $replace[] = '<' . $selfClosingTag . ' />';
768
-      $replacement[] = '<' . $selfClosingTag . '>';
765
+      $replace[] = '<'.$selfClosingTag.'/>';
766
+      $replacement[] = '<'.$selfClosingTag.'>';
767
+      $replace[] = '<'.$selfClosingTag.' />';
768
+      $replacement[] = '<'.$selfClosingTag.'>';
769 769
     }
770 770
     $html = \str_replace(
771 771
         $replace,
@@ -868,7 +868,7 @@  discard block
 block discarded – undo
868 868
     }
869 869
 
870 870
     $attrs = [];
871
-    foreach ((array)$attributes as $attrName => $attrValue) {
871
+    foreach ((array) $attributes as $attrName => $attrValue) {
872 872
 
873 873
       if (isset(self::$booleanAttributes[$attrName])) {
874 874
         continue;
@@ -947,7 +947,7 @@  discard block
 block discarded – undo
947 947
       }
948 948
 
949 949
       $this->protectedChildNodes[$counter] = $element->text();
950
-      $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
950
+      $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
951 951
 
952 952
       ++$counter;
953 953
     }
@@ -962,11 +962,11 @@  discard block
 block discarded – undo
962 962
         continue;
963 963
       }
964 964
 
965
-      $this->protectedChildNodes[$counter] = '<!--' . $text . '-->';
965
+      $this->protectedChildNodes[$counter] = '<!--'.$text.'-->';
966 966
 
967 967
       /* @var $node \DOMComment */
968 968
       $node = $element->getNode();
969
-      $child = new \DOMText('<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>');
969
+      $child = new \DOMText('<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>');
970 970
       $element->getNode()->parentNode->replaceChild($child, $node);
971 971
 
972 972
       ++$counter;
@@ -1163,7 +1163,7 @@  discard block
 block discarded – undo
1163 1163
         continue;
1164 1164
       }
1165 1165
 
1166
-      $attrValue .= \trim($class) . ' ';
1166
+      $attrValue .= \trim($class).' ';
1167 1167
     }
1168 1168
     $attrValue = \trim($attrValue);
1169 1169
 
Please login to merge, or discard this patch.