Completed
Push — master ( b4b5ef...60e98c )
by Lars
01:19
created
src/voku/helper/HtmlMin.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -482,8 +482,8 @@
 block discarded – undo
482 482
   }
483 483
 
484 484
   /**
485
-   * @param $html
486
-   * @param $decodeUtf8Specials
485
+   * @param string $html
486
+   * @param boolean $decodeUtf8Specials
487 487
    *
488 488
    * @return string
489 489
    */
Please login to merge, or discard this 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.
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -500,184 +500,184 @@
 block discarded – undo
500 500
     return \in_array($tag_name, self::$optional_end_tags, true)
501 501
            ||
502 502
            (
503
-               $tag_name == 'li'
503
+                $tag_name == 'li'
504 504
                &&
505 505
                (
506
-                   $nextSibling === null
506
+                    $nextSibling === null
507 507
                    ||
508 508
                    (
509
-                       $nextSibling instanceof \DOMElement
509
+                        $nextSibling instanceof \DOMElement
510 510
                        &&
511 511
                        $nextSibling->tagName == 'li'
512
-                   )
513
-               )
514
-           )
512
+                    )
513
+                )
514
+            )
515 515
            ||
516 516
            (
517
-               (
518
-                   $tag_name == 'rp'
519
-               )
517
+                (
518
+                    $tag_name == 'rp'
519
+                )
520 520
                &&
521 521
                (
522
-                   $nextSibling === null
522
+                    $nextSibling === null
523 523
                    ||
524 524
                    (
525
-                       $nextSibling instanceof \DOMElement
525
+                        $nextSibling instanceof \DOMElement
526 526
                        &&
527 527
                        (
528
-                           $nextSibling->tagName == 'rp'
528
+                            $nextSibling->tagName == 'rp'
529 529
                            ||
530 530
                            $nextSibling->tagName == 'rt'
531
-                       )
532
-                   )
533
-               )
534
-           )
531
+                        )
532
+                    )
533
+                )
534
+            )
535 535
            ||
536 536
            (
537
-               $tag_name == 'tr'
537
+                $tag_name == 'tr'
538 538
                &&
539 539
                (
540
-                   $nextSibling === null
540
+                    $nextSibling === null
541 541
                    ||
542 542
                    (
543
-                       $nextSibling instanceof \DOMElement
543
+                        $nextSibling instanceof \DOMElement
544 544
                        &&
545 545
                        $nextSibling->tagName == 'tr'
546
-                   )
547
-               )
548
-           )
546
+                    )
547
+                )
548
+            )
549 549
            ||
550 550
            (
551
-               (
552
-                   $tag_name == 'td'
551
+                (
552
+                    $tag_name == 'td'
553 553
                    ||
554 554
                    $tag_name == 'th'
555
-               )
555
+                )
556 556
                &&
557 557
                (
558
-                   $nextSibling === null
558
+                    $nextSibling === null
559 559
                    ||
560 560
                    (
561
-                       $nextSibling instanceof \DOMElement
561
+                        $nextSibling instanceof \DOMElement
562 562
                        &&
563 563
                        (
564
-                           $nextSibling->tagName == 'td'
564
+                            $nextSibling->tagName == 'td'
565 565
                            ||
566 566
                            $nextSibling->tagName == 'th'
567
-                       )
568
-                   )
569
-               )
570
-           )
567
+                        )
568
+                    )
569
+                )
570
+            )
571 571
            ||
572 572
            (
573
-               (
574
-                   $tag_name == 'dd'
573
+                (
574
+                    $tag_name == 'dd'
575 575
                    ||
576 576
                    $tag_name == 'dt'
577
-               )
577
+                )
578 578
                &&
579 579
                (
580
-                   (
581
-                       $nextSibling === null
580
+                    (
581
+                        $nextSibling === null
582 582
                        &&
583 583
                        $tag_name == 'dd'
584
-                   )
584
+                    )
585 585
                    ||
586 586
                    (
587
-                       $nextSibling instanceof \DOMElement
587
+                        $nextSibling instanceof \DOMElement
588 588
                        &&
589 589
                        (
590
-                           $nextSibling->tagName == 'dd'
590
+                            $nextSibling->tagName == 'dd'
591 591
                            ||
592 592
                            $nextSibling->tagName == 'dt'
593
-                       )
594
-                   )
595
-               )
596
-           )
593
+                        )
594
+                    )
595
+                )
596
+            )
597 597
            ||
598 598
            (
599
-               $tag_name == 'option'
599
+                $tag_name == 'option'
600 600
                &&
601 601
                (
602
-                   $nextSibling === null
602
+                    $nextSibling === null
603 603
                    ||
604 604
                    (
605
-                       $nextSibling instanceof \DOMElement
605
+                        $nextSibling instanceof \DOMElement
606 606
                        &&
607 607
                        (
608
-                           $nextSibling->tagName == 'option'
608
+                            $nextSibling->tagName == 'option'
609 609
                            ||
610 610
                            $nextSibling->tagName == 'optgroup'
611
-                       )
612
-                   )
613
-               )
614
-           )
611
+                        )
612
+                    )
613
+                )
614
+            )
615 615
            ||
616 616
            (
617
-               $tag_name == 'p'
617
+                $tag_name == 'p'
618 618
                &&
619 619
                (
620
-                   (
621
-                       $nextSibling === null
620
+                    (
621
+                        $nextSibling === null
622 622
                        &&
623 623
                        (
624
-                           $node->parentNode !== null
624
+                            $node->parentNode !== null
625 625
                            &&
626 626
                            !\in_array(
627
-                               $node->parentNode->tagName,
628
-                               [
629
-                                   'a',
630
-                                   'audio',
631
-                                   'del',
632
-                                   'ins',
633
-                                   'map',
634
-                                   'noscript',
635
-                                   'video'
636
-                               ],
637
-                               true
638
-                           )
639
-                       )
640
-                   )
627
+                                $node->parentNode->tagName,
628
+                                [
629
+                                    'a',
630
+                                    'audio',
631
+                                    'del',
632
+                                    'ins',
633
+                                    'map',
634
+                                    'noscript',
635
+                                    'video'
636
+                                ],
637
+                                true
638
+                            )
639
+                        )
640
+                    )
641 641
                    ||
642 642
                    (
643
-                       $nextSibling instanceof \DOMElement
643
+                        $nextSibling instanceof \DOMElement
644 644
                        &&
645 645
                        \in_array(
646
-                           $nextSibling->tagName,
647
-                           [
648
-                               'address',
649
-                               'article',
650
-                               'aside',
651
-                               'blockquote',
652
-                               'dir',
653
-                               'div',
654
-                               'dl',
655
-                               'fieldset',
656
-                               'footer',
657
-                               'form',
658
-                               'h1',
659
-                               'h2',
660
-                               'h3',
661
-                               'h4',
662
-                               'h5',
663
-                               'h6',
664
-                               'header',
665
-                               'hgroup',
666
-                               'hr',
667
-                               'menu',
668
-                               'nav',
669
-                               'ol',
670
-                               'p',
671
-                               'pre',
672
-                               'section',
673
-                               'table',
674
-                               'ul',
675
-                           ],
676
-                           true
677
-                       )
678
-                   )
679
-               )
680
-           );
646
+                            $nextSibling->tagName,
647
+                            [
648
+                                'address',
649
+                                'article',
650
+                                'aside',
651
+                                'blockquote',
652
+                                'dir',
653
+                                'div',
654
+                                'dl',
655
+                                'fieldset',
656
+                                'footer',
657
+                                'form',
658
+                                'h1',
659
+                                'h2',
660
+                                'h3',
661
+                                'h4',
662
+                                'h5',
663
+                                'h6',
664
+                                'header',
665
+                                'hgroup',
666
+                                'hr',
667
+                                'menu',
668
+                                'nav',
669
+                                'ol',
670
+                                'p',
671
+                                'pre',
672
+                                'section',
673
+                                'table',
674
+                                'ul',
675
+                            ],
676
+                            true
677
+                        )
678
+                    )
679
+                )
680
+            );
681 681
   }
682 682
 
683 683
   protected function domNodeToString(\DOMNode $node): string
Please login to merge, or discard this patch.