voku /
HtmlMin
@@ -736,184 +736,184 @@ discard block |
||
| 736 | 736 | return \in_array($tag_name, self::$optional_end_tags, true) |
| 737 | 737 | || |
| 738 | 738 | ( |
| 739 | - $tag_name === 'li' |
|
| 739 | + $tag_name === 'li' |
|
| 740 | 740 | && |
| 741 | 741 | ( |
| 742 | - $nextSibling === null |
|
| 742 | + $nextSibling === null |
|
| 743 | 743 | || |
| 744 | 744 | ( |
| 745 | - $nextSibling instanceof \DOMElement |
|
| 745 | + $nextSibling instanceof \DOMElement |
|
| 746 | 746 | && |
| 747 | 747 | $nextSibling->tagName === 'li' |
| 748 | - ) |
|
| 749 | - ) |
|
| 750 | - ) |
|
| 748 | + ) |
|
| 749 | + ) |
|
| 750 | + ) |
|
| 751 | 751 | || |
| 752 | 752 | ( |
| 753 | - ( |
|
| 754 | - $tag_name === 'rp' |
|
| 755 | - ) |
|
| 753 | + ( |
|
| 754 | + $tag_name === 'rp' |
|
| 755 | + ) |
|
| 756 | 756 | && |
| 757 | 757 | ( |
| 758 | - $nextSibling === null |
|
| 758 | + $nextSibling === null |
|
| 759 | 759 | || |
| 760 | 760 | ( |
| 761 | - $nextSibling instanceof \DOMElement |
|
| 761 | + $nextSibling instanceof \DOMElement |
|
| 762 | 762 | && |
| 763 | 763 | ( |
| 764 | - $nextSibling->tagName === 'rp' |
|
| 764 | + $nextSibling->tagName === 'rp' |
|
| 765 | 765 | || |
| 766 | 766 | $nextSibling->tagName === 'rt' |
| 767 | - ) |
|
| 768 | - ) |
|
| 769 | - ) |
|
| 770 | - ) |
|
| 767 | + ) |
|
| 768 | + ) |
|
| 769 | + ) |
|
| 770 | + ) |
|
| 771 | 771 | || |
| 772 | 772 | ( |
| 773 | - $tag_name === 'tr' |
|
| 773 | + $tag_name === 'tr' |
|
| 774 | 774 | && |
| 775 | 775 | ( |
| 776 | - $nextSibling === null |
|
| 776 | + $nextSibling === null |
|
| 777 | 777 | || |
| 778 | 778 | ( |
| 779 | - $nextSibling instanceof \DOMElement |
|
| 779 | + $nextSibling instanceof \DOMElement |
|
| 780 | 780 | && |
| 781 | 781 | $nextSibling->tagName === 'tr' |
| 782 | - ) |
|
| 783 | - ) |
|
| 784 | - ) |
|
| 782 | + ) |
|
| 783 | + ) |
|
| 784 | + ) |
|
| 785 | 785 | || |
| 786 | 786 | ( |
| 787 | - ( |
|
| 788 | - $tag_name === 'td' |
|
| 787 | + ( |
|
| 788 | + $tag_name === 'td' |
|
| 789 | 789 | || |
| 790 | 790 | $tag_name === 'th' |
| 791 | - ) |
|
| 791 | + ) |
|
| 792 | 792 | && |
| 793 | 793 | ( |
| 794 | - $nextSibling === null |
|
| 794 | + $nextSibling === null |
|
| 795 | 795 | || |
| 796 | 796 | ( |
| 797 | - $nextSibling instanceof \DOMElement |
|
| 797 | + $nextSibling instanceof \DOMElement |
|
| 798 | 798 | && |
| 799 | 799 | ( |
| 800 | - $nextSibling->tagName === 'td' |
|
| 800 | + $nextSibling->tagName === 'td' |
|
| 801 | 801 | || |
| 802 | 802 | $nextSibling->tagName === 'th' |
| 803 | - ) |
|
| 804 | - ) |
|
| 805 | - ) |
|
| 806 | - ) |
|
| 803 | + ) |
|
| 804 | + ) |
|
| 805 | + ) |
|
| 806 | + ) |
|
| 807 | 807 | || |
| 808 | 808 | ( |
| 809 | - ( |
|
| 810 | - $tag_name === 'dd' |
|
| 809 | + ( |
|
| 810 | + $tag_name === 'dd' |
|
| 811 | 811 | || |
| 812 | 812 | $tag_name === 'dt' |
| 813 | - ) |
|
| 813 | + ) |
|
| 814 | 814 | && |
| 815 | 815 | ( |
| 816 | - ( |
|
| 817 | - $nextSibling === null |
|
| 816 | + ( |
|
| 817 | + $nextSibling === null |
|
| 818 | 818 | && |
| 819 | 819 | $tag_name === 'dd' |
| 820 | - ) |
|
| 820 | + ) |
|
| 821 | 821 | || |
| 822 | 822 | ( |
| 823 | - $nextSibling instanceof \DOMElement |
|
| 823 | + $nextSibling instanceof \DOMElement |
|
| 824 | 824 | && |
| 825 | 825 | ( |
| 826 | - $nextSibling->tagName === 'dd' |
|
| 826 | + $nextSibling->tagName === 'dd' |
|
| 827 | 827 | || |
| 828 | 828 | $nextSibling->tagName === 'dt' |
| 829 | - ) |
|
| 830 | - ) |
|
| 831 | - ) |
|
| 832 | - ) |
|
| 829 | + ) |
|
| 830 | + ) |
|
| 831 | + ) |
|
| 832 | + ) |
|
| 833 | 833 | || |
| 834 | 834 | ( |
| 835 | - $tag_name === 'option' |
|
| 835 | + $tag_name === 'option' |
|
| 836 | 836 | && |
| 837 | 837 | ( |
| 838 | - $nextSibling === null |
|
| 838 | + $nextSibling === null |
|
| 839 | 839 | || |
| 840 | 840 | ( |
| 841 | - $nextSibling instanceof \DOMElement |
|
| 841 | + $nextSibling instanceof \DOMElement |
|
| 842 | 842 | && |
| 843 | 843 | ( |
| 844 | - $nextSibling->tagName === 'option' |
|
| 844 | + $nextSibling->tagName === 'option' |
|
| 845 | 845 | || |
| 846 | 846 | $nextSibling->tagName === 'optgroup' |
| 847 | - ) |
|
| 848 | - ) |
|
| 849 | - ) |
|
| 850 | - ) |
|
| 847 | + ) |
|
| 848 | + ) |
|
| 849 | + ) |
|
| 850 | + ) |
|
| 851 | 851 | || |
| 852 | 852 | ( |
| 853 | - $tag_name === 'p' |
|
| 853 | + $tag_name === 'p' |
|
| 854 | 854 | && |
| 855 | 855 | ( |
| 856 | - ( |
|
| 857 | - $nextSibling === null |
|
| 856 | + ( |
|
| 857 | + $nextSibling === null |
|
| 858 | 858 | && |
| 859 | 859 | ( |
| 860 | - $node->parentNode !== null |
|
| 860 | + $node->parentNode !== null |
|
| 861 | 861 | && |
| 862 | 862 | !\in_array( |
| 863 | - $node->parentNode->nodeName, |
|
| 864 | - [ |
|
| 865 | - 'a', |
|
| 866 | - 'audio', |
|
| 867 | - 'del', |
|
| 868 | - 'ins', |
|
| 869 | - 'map', |
|
| 870 | - 'noscript', |
|
| 871 | - 'video', |
|
| 872 | - ], |
|
| 873 | - true |
|
| 874 | - ) |
|
| 875 | - ) |
|
| 876 | - ) |
|
| 863 | + $node->parentNode->nodeName, |
|
| 864 | + [ |
|
| 865 | + 'a', |
|
| 866 | + 'audio', |
|
| 867 | + 'del', |
|
| 868 | + 'ins', |
|
| 869 | + 'map', |
|
| 870 | + 'noscript', |
|
| 871 | + 'video', |
|
| 872 | + ], |
|
| 873 | + true |
|
| 874 | + ) |
|
| 875 | + ) |
|
| 876 | + ) |
|
| 877 | 877 | || |
| 878 | 878 | ( |
| 879 | - $nextSibling instanceof \DOMElement |
|
| 879 | + $nextSibling instanceof \DOMElement |
|
| 880 | 880 | && |
| 881 | 881 | \in_array( |
| 882 | - $nextSibling->tagName, |
|
| 883 | - [ |
|
| 884 | - 'address', |
|
| 885 | - 'article', |
|
| 886 | - 'aside', |
|
| 887 | - 'blockquote', |
|
| 888 | - 'dir', |
|
| 889 | - 'div', |
|
| 890 | - 'dl', |
|
| 891 | - 'fieldset', |
|
| 892 | - 'footer', |
|
| 893 | - 'form', |
|
| 894 | - 'h1', |
|
| 895 | - 'h2', |
|
| 896 | - 'h3', |
|
| 897 | - 'h4', |
|
| 898 | - 'h5', |
|
| 899 | - 'h6', |
|
| 900 | - 'header', |
|
| 901 | - 'hgroup', |
|
| 902 | - 'hr', |
|
| 903 | - 'menu', |
|
| 904 | - 'nav', |
|
| 905 | - 'ol', |
|
| 906 | - 'p', |
|
| 907 | - 'pre', |
|
| 908 | - 'section', |
|
| 909 | - 'table', |
|
| 910 | - 'ul', |
|
| 911 | - ], |
|
| 912 | - true |
|
| 913 | - ) |
|
| 914 | - ) |
|
| 915 | - ) |
|
| 916 | - ); |
|
| 882 | + $nextSibling->tagName, |
|
| 883 | + [ |
|
| 884 | + 'address', |
|
| 885 | + 'article', |
|
| 886 | + 'aside', |
|
| 887 | + 'blockquote', |
|
| 888 | + 'dir', |
|
| 889 | + 'div', |
|
| 890 | + 'dl', |
|
| 891 | + 'fieldset', |
|
| 892 | + 'footer', |
|
| 893 | + 'form', |
|
| 894 | + 'h1', |
|
| 895 | + 'h2', |
|
| 896 | + 'h3', |
|
| 897 | + 'h4', |
|
| 898 | + 'h5', |
|
| 899 | + 'h6', |
|
| 900 | + 'header', |
|
| 901 | + 'hgroup', |
|
| 902 | + 'hr', |
|
| 903 | + 'menu', |
|
| 904 | + 'nav', |
|
| 905 | + 'ol', |
|
| 906 | + 'p', |
|
| 907 | + 'pre', |
|
| 908 | + 'section', |
|
| 909 | + 'table', |
|
| 910 | + 'ul', |
|
| 911 | + ], |
|
| 912 | + true |
|
| 913 | + ) |
|
| 914 | + ) |
|
| 915 | + ) |
|
| 916 | + ); |
|
| 917 | 917 | } |
| 918 | 918 | |
| 919 | 919 | protected function domNodeToString(\DOMNode $node): string |
@@ -945,9 +945,9 @@ discard block |
||
| 945 | 945 | } |
| 946 | 946 | |
| 947 | 947 | $html .= '<!DOCTYPE ' . $child->name . '' |
| 948 | - . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '') |
|
| 949 | - . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '') |
|
| 950 | - . '>'; |
|
| 948 | + . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '') |
|
| 949 | + . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '') |
|
| 950 | + . '>'; |
|
| 951 | 951 | } |
| 952 | 952 | } elseif ($child instanceof \DOMElement) { |
| 953 | 953 | $html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child)); |
