Inspection of "[+]: remove unnecessary </source> closing tag" - voku/HtmlMin - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3ca20d...affb1c )

by Lars

created 2019-08-30 12:23 UTC

Status

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1175,8 +1175,8 @@
 block discarded – undo
     }
 
     /**
-     * @param $html
-     * @param $decodeUtf8Specials
+     * @param string $html
+     * @param boolean $decodeUtf8Specials
      *
      * @return string
      */

Please login to merge, or discard this patch.

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -714,7 +714,7 @@  discard block
 block discarded – undo
                     $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 .= ' ';
             }
         }
@@ -979,21 +979,21 @@  discard block
 block discarded – undo
                         $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) {
@@ -1033,7 +1033,7 @@  discard block
 block discarded – undo
                     $html .= $child->wholeText;
                 }
             } elseif ($child instanceof \DOMComment) {
-                $html .= '<!--' . $child->textContent . '-->';
+                $html .= '<!--'.$child->textContent.'-->';
             }
         }
 
@@ -1125,8 +1125,8 @@  discard block
 block discarded – undo
         // Remove extra white-space(s) between HTML attribute(s)
         $html = (string) \preg_replace_callback(
             '#<([^/\s<>!]+)(?:\s+([^<>]*?)\s*|\s*)(/?)>#',
-            static function ($matches) {
-                return '<' . $matches[1] . \preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]) . $matches[3] . '>';
+            static function($matches) {
+                return '<'.$matches[1].\preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#s', ' $1$2', $matches[2]).$matches[3].'>';
             },
             $html
         );
@@ -1141,7 +1141,7 @@  discard block
 block discarded – undo
         // -------------------------------------------------------------------------
 
         $html = (string) \preg_replace_callback(
-            '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>]*)?>(?<value>.*?)<\/' . $this->protectedChildNodesHelper . '>/',
+            '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>]*)?>(?<value>.*?)<\/'.$this->protectedChildNodesHelper.'>/',
             [$this, 'restoreProtectedHtml'],
             $html
         );
@@ -1160,14 +1160,14 @@  discard block
 block discarded – undo
 
         $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>',
@@ -1186,10 +1186,10 @@  discard block
 block discarded – undo
         $replace = [];
         $replacement = [];
         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,
@@ -1197,7 +1197,7 @@  discard block
 block discarded – undo
             $html
         );
 
-        $html = (string) \preg_replace('#<\b(' . $CACHE_SELF_CLOSING_TAGS . ')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html);
+        $html = (string) \preg_replace('#<\b('.$CACHE_SELF_CLOSING_TAGS.')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html);
 
         // ------------------------------------
         // check if compression worked
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
             }
 
             $this->protectedChildNodes[$counter] = $element->innerhtml;
-            $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
+            $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
 
             ++$counter;
         }
@@ -1315,7 +1315,7 @@  discard block
 block discarded – undo
             }
 
             $this->protectedChildNodes[$counter] = $element->parentNode()->innerHtml();
-            $element->getNode()->parentNode->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
+            $element->getNode()->parentNode->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
 
             ++$counter;
         }
@@ -1328,11 +1328,11 @@  discard block
 block discarded – undo
                 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.'>');
             /** @noinspection UnusedFunctionResultInspection */
             $element->getNode()->parentNode->replaceChild($child, $node);
 

Please login to merge, or discard this patch.

Indentation +115 added lines, -115 removed lines patch added patch discarded remove patch

@@ -778,206 +778,206 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
                     }
 
                     $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));

Please login to merge, or discard this patch.

src/voku/helper/HtmlMinDomObserverOptimizeAttributes.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -202,7 +202,7 @@
 block discarded – undo
                 continue;
             }
 
-            $attrValue .= \trim($class) . ' ';
+            $attrValue .= \trim($class).' ';
         }
 
         return \trim($attrValue);

Please login to merge, or discard this patch.

		@@ -1175,8 +1175,8 @@
		block discarded – undo
1175	1175	}
1176	1176
1177	1177	/**
1178		- * @param $html
1179		- * @param $decodeUtf8Specials
	1178	+ * @param string $html
	1179	+ * @param boolean $decodeUtf8Specials
1180	1180	*
1181	1181	* @return string
1182	1182	*/

		@@ -714,7 +714,7 @@ discard block
		block discarded – undo
714	714	$attr_val = $attribute->value;
715	715	}
716	716
717		- $attr_str .= ($omit_quotes ? '' : $quoteTmp) . $attr_val . ($omit_quotes ? '' : $quoteTmp);
	717	+ $attr_str .= ($omit_quotes ? '' : $quoteTmp).$attr_val.($omit_quotes ? '' : $quoteTmp);
718	718	$attr_str .= ' ';
719	719	}
720	720	}
		@@ -979,21 +979,21 @@ discard block
		block discarded – undo
979	979	$tmpTypePublic = 'PUBLIC';
980	980	}
981	981
982		- $html .= '<!DOCTYPE ' . $child->name . ''
983		- . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
984		- . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
	982	+ $html .= '<!DOCTYPE '.$child->name.''
	983	+ . ($child->publicId ? ' '.$tmpTypePublic.' "'.$child->publicId.'"' : '')
	984	+ . ($child->systemId ? ' '.$tmpTypeSystem.' "'.$child->systemId.'"' : '')
985	985	. '>';
986	986	}
987	987	} elseif ($child instanceof \DOMElement) {
988		- $html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));
989		- $html .= '>' . $this->domNodeToString($child);
	988	+ $html .= \rtrim('<'.$child->tagName.' '.$this->domNodeAttributesToString($child));
	989	+ $html .= '>'.$this->domNodeToString($child);
990	990
991	991	if (
992	992	!$this->doRemoveOmittedHtmlTags
993	993	\|\|
994	994	!$this->domNodeClosingTagOptional($child)
995	995	) {
996		- $html .= '</' . $child->tagName . '>';
	996	+ $html .= '</'.$child->tagName.'>';
997	997	}
998	998
999	999	if (!$this->doRemoveWhitespaceAroundTags) {
		@@ -1033,7 +1033,7 @@ discard block
		block discarded – undo
1033	1033	$html .= $child->wholeText;
1034	1034	}
1035	1035	} elseif ($child instanceof \DOMComment) {
1036		- $html .= '<!--' . $child->textContent . '-->';
	1036	+ $html .= '<!--'.$child->textContent.'-->';
1037	1037	}
1038	1038	}
1039	1039
		@@ -1125,8 +1125,8 @@ discard block
		block discarded – undo
1125	1125	// Remove extra white-space(s) between HTML attribute(s)
1126	1126	$html = (string) \preg_replace_callback(
1127	1127	'#<([^/\s<>!]+)(?:\s+([^<>]?)\s\|\s*)(/?)>#',
1128		- static function ($matches) {
1129		- return '<' . $matches[1] . \preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+\|$)#s', ' $1$2', $matches[2]) . $matches[3] . '>';
	1128	+ static function($matches) {
	1129	+ return '<'.$matches[1].\preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+\|$)#s', ' $1$2', $matches[2]).$matches[3].'>';
1130	1130	},
1131	1131	$html
1132	1132	);
		@@ -1141,7 +1141,7 @@ discard block
		block discarded – undo
1141	1141	// -------------------------------------------------------------------------
1142	1142
1143	1143	$html = (string) \preg_replace_callback(
1144		- '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>])?>(?<value>.?)<\/' . $this->protectedChildNodesHelper . '>/',
	1144	+ '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>])?>(?<value>.?)<\/'.$this->protectedChildNodesHelper.'>/',
1145	1145	[$this, 'restoreProtectedHtml'],
1146	1146	$html
1147	1147	);
		@@ -1160,14 +1160,14 @@ discard block
		block discarded – undo
1160	1160
1161	1161	$html = \str_replace(
1162	1162	[
1163		- 'html>' . "\n",
1164		- "\n" . '<html',
1165		- 'html/>' . "\n",
1166		- "\n" . '</html',
1167		- 'head>' . "\n",
1168		- "\n" . '<head',
1169		- 'head/>' . "\n",
1170		- "\n" . '</head',
	1163	+ 'html>'."\n",
	1164	+ "\n".'<html',
	1165	+ 'html/>'."\n",
	1166	+ "\n".'</html',
	1167	+ 'head>'."\n",
	1168	+ "\n".'<head',
	1169	+ 'head/>'."\n",
	1170	+ "\n".'</head',
1171	1171	],
1172	1172	[
1173	1173	'html>',
		@@ -1186,10 +1186,10 @@ discard block
		block discarded – undo
1186	1186	$replace = [];
1187	1187	$replacement = [];
1188	1188	foreach (self::$selfClosingTags as $selfClosingTag) {
1189		- $replace[] = '<' . $selfClosingTag . '/>';
1190		- $replacement[] = '<' . $selfClosingTag . '>';
1191		- $replace[] = '<' . $selfClosingTag . ' />';
1192		- $replacement[] = '<' . $selfClosingTag . '>';
	1189	+ $replace[] = '<'.$selfClosingTag.'/>';
	1190	+ $replacement[] = '<'.$selfClosingTag.'>';
	1191	+ $replace[] = '<'.$selfClosingTag.' />';
	1192	+ $replacement[] = '<'.$selfClosingTag.'>';
1193	1193	}
1194	1194	$html = \str_replace(
1195	1195	$replace,
		@@ -1197,7 +1197,7 @@ discard block
		block discarded – undo
1197	1197	$html
1198	1198	);
1199	1199
1200		- $html = (string) \preg_replace('#<\b(' . $CACHE_SELF_CLOSING_TAGS . ')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html);
	1200	+ $html = (string) \preg_replace('#<\b('.$CACHE_SELF_CLOSING_TAGS.')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html);
1201	1201
1202	1202	// ------------------------------------
1203	1203	// check if compression worked
		@@ -1304,7 +1304,7 @@ discard block
		block discarded – undo
1304	1304	}
1305	1305
1306	1306	$this->protectedChildNodes[$counter] = $element->innerhtml;
1307		- $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
	1307	+ $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
1308	1308
1309	1309	++$counter;
1310	1310	}
		@@ -1315,7 +1315,7 @@ discard block
		block discarded – undo
1315	1315	}
1316	1316
1317	1317	$this->protectedChildNodes[$counter] = $element->parentNode()->innerHtml();
1318		- $element->getNode()->parentNode->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>';
	1318	+ $element->getNode()->parentNode->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>';
1319	1319
1320	1320	++$counter;
1321	1321	}
		@@ -1328,11 +1328,11 @@ discard block
		block discarded – undo
1328	1328	continue;
1329	1329	}
1330	1330
1331		- $this->protectedChildNodes[$counter] = '<!--' . $text . '-->';
	1331	+ $this->protectedChildNodes[$counter] = '<!--'.$text.'-->';
1332	1332
1333	1333	/* @var $node \DOMComment */
1334	1334	$node = $element->getNode();
1335		- $child = new \DOMText('<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>');
	1335	+ $child = new \DOMText('<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>');
1336	1336	/** @noinspection UnusedFunctionResultInspection */
1337	1337	$element->getNode()->parentNode->replaceChild($child, $node);
1338	1338

		@@ -778,206 +778,206 @@ discard block
		block discarded – undo
778	778	return \in_array($tag_name, self::$optional_end_tags, true)
779	779	\|\|
780	780	(
781		- $tag_name === 'li'
	781	+ $tag_name === 'li'
782	782	&&
783	783	(
784		- $nextSibling === null
	784	+ $nextSibling === null
785	785	\|\|
786	786	(
787		- $nextSibling instanceof \DOMElement
	787	+ $nextSibling instanceof \DOMElement
788	788	&&
789	789	$nextSibling->tagName === 'li'
790		- )
791		- )
792		- )
	790	+ )
	791	+ )
	792	+ )
793	793	\|\|
794	794	(
795		- $tag_name === 'rp'
	795	+ $tag_name === 'rp'
796	796	&&
797	797	(
798		- $nextSibling === null
	798	+ $nextSibling === null
799	799	\|\|
800	800	(
801		- $nextSibling instanceof \DOMElement
	801	+ $nextSibling instanceof \DOMElement
802	802	&&
803	803	(
804		- $nextSibling->tagName === 'rp'
	804	+ $nextSibling->tagName === 'rp'
805	805	\|\|
806	806	$nextSibling->tagName === 'rt'
807		- )
808		- )
809		- )
810		- )
	807	+ )
	808	+ )
	809	+ )
	810	+ )
811	811	\|\|
812	812	(
813		- $tag_name === 'tr'
	813	+ $tag_name === 'tr'
814	814	&&
815	815	(
816		- $nextSibling === null
	816	+ $nextSibling === null
817	817	\|\|
818	818	(
819		- $nextSibling instanceof \DOMElement
	819	+ $nextSibling instanceof \DOMElement
820	820	&&
821	821	$nextSibling->tagName === 'tr'
822		- )
823		- )
824		- )
	822	+ )
	823	+ )
	824	+ )
825	825	\|\|
826	826	(
827		- $tag_name === 'source'
	827	+ $tag_name === 'source'
828	828	&&
829	829	(
830		- $parent_tag_name === 'audio'
	830	+ $parent_tag_name === 'audio'
831	831	\|\|
832	832	$parent_tag_name === 'video'
833	833	\|\|
834	834	$parent_tag_name === 'picture'
835	835	\|\|
836	836	$parent_tag_name === 'source'
837		- )
	837	+ )
838	838	&&
839	839	(
840		- $nextSibling === null
	840	+ $nextSibling === null
841	841	\|\|
842	842	(
843		- $nextSibling instanceof \DOMElement
	843	+ $nextSibling instanceof \DOMElement
844	844	&&
845	845	$nextSibling->tagName === 'source'
846		- )
847		- )
848		- )
	846	+ )
	847	+ )
	848	+ )
849	849	\|\|
850	850	(
851		- (
852		- $tag_name === 'td'
	851	+ (
	852	+ $tag_name === 'td'
853	853	\|\|
854	854	$tag_name === 'th'
855		- )
	855	+ )
856	856	&&
857	857	(
858		- $nextSibling === null
	858	+ $nextSibling === null
859	859	\|\|
860	860	(
861		- $nextSibling instanceof \DOMElement
	861	+ $nextSibling instanceof \DOMElement
862	862	&&
863	863	(
864		- $nextSibling->tagName === 'td'
	864	+ $nextSibling->tagName === 'td'
865	865	\|\|
866	866	$nextSibling->tagName === 'th'
867		- )
868		- )
869		- )
870		- )
	867	+ )
	868	+ )
	869	+ )
	870	+ )
871	871	\|\|
872	872	(
873		- (
874		- $tag_name === 'dd'
	873	+ (
	874	+ $tag_name === 'dd'
875	875	\|\|
876	876	$tag_name === 'dt'
877		- )
	877	+ )
878	878	&&
879	879	(
880		- (
881		- $nextSibling === null
	880	+ (
	881	+ $nextSibling === null
882	882	&&
883	883	$tag_name === 'dd'
884		- )
	884	+ )
885	885	\|\|
886	886	(
887		- $nextSibling instanceof \DOMElement
	887	+ $nextSibling instanceof \DOMElement
888	888	&&
889	889	(
890		- $nextSibling->tagName === 'dd'
	890	+ $nextSibling->tagName === 'dd'
891	891	\|\|
892	892	$nextSibling->tagName === 'dt'
893		- )
894		- )
895		- )
896		- )
	893	+ )
	894	+ )
	895	+ )
	896	+ )
897	897	\|\|
898	898	(
899		- $tag_name === 'option'
	899	+ $tag_name === 'option'
900	900	&&
901	901	(
902		- $nextSibling === null
	902	+ $nextSibling === null
903	903	\|\|
904	904	(
905		- $nextSibling instanceof \DOMElement
	905	+ $nextSibling instanceof \DOMElement
906	906	&&
907	907	(
908		- $nextSibling->tagName === 'option'
	908	+ $nextSibling->tagName === 'option'
909	909	\|\|
910	910	$nextSibling->tagName === 'optgroup'
911		- )
912		- )
913		- )
914		- )
	911	+ )
	912	+ )
	913	+ )
	914	+ )
915	915	\|\|
916	916	(
917		- $tag_name === 'p'
	917	+ $tag_name === 'p'
918	918	&&
919	919	(
920		- (
921		- $nextSibling === null
	920	+ (
	921	+ $nextSibling === null
922	922	&&
923	923	(
924		- $node->parentNode !== null
	924	+ $node->parentNode !== null
925	925	&&
926	926	!\in_array(
927		- $node->parentNode->nodeName,
928		- [
929		- 'a',
930		- 'audio',
931		- 'del',
932		- 'ins',
933		- 'map',
934		- 'noscript',
935		- 'video',
936		- ],
937		- true
938		- )
939		- )
940		- )
	927	+ $node->parentNode->nodeName,
	928	+ [
	929	+ 'a',
	930	+ 'audio',
	931	+ 'del',
	932	+ 'ins',
	933	+ 'map',
	934	+ 'noscript',
	935	+ 'video',
	936	+ ],
	937	+ true
	938	+ )
	939	+ )
	940	+ )
941	941	\|\|
942	942	(
943		- $nextSibling instanceof \DOMElement
	943	+ $nextSibling instanceof \DOMElement
944	944	&&
945	945	\in_array(
946		- $nextSibling->tagName,
947		- [
948		- 'address',
949		- 'article',
950		- 'aside',
951		- 'blockquote',
952		- 'dir',
953		- 'div',
954		- 'dl',
955		- 'fieldset',
956		- 'footer',
957		- 'form',
958		- 'h1',
959		- 'h2',
960		- 'h3',
961		- 'h4',
962		- 'h5',
963		- 'h6',
964		- 'header',
965		- 'hgroup',
966		- 'hr',
967		- 'menu',
968		- 'nav',
969		- 'ol',
970		- 'p',
971		- 'pre',
972		- 'section',
973		- 'table',
974		- 'ul',
975		- ],
976		- true
977		- )
978		- )
979		- )
980		- );
	946	+ $nextSibling->tagName,
	947	+ [
	948	+ 'address',
	949	+ 'article',
	950	+ 'aside',
	951	+ 'blockquote',
	952	+ 'dir',
	953	+ 'div',
	954	+ 'dl',
	955	+ 'fieldset',
	956	+ 'footer',
	957	+ 'form',
	958	+ 'h1',
	959	+ 'h2',
	960	+ 'h3',
	961	+ 'h4',
	962	+ 'h5',
	963	+ 'h6',
	964	+ 'header',
	965	+ 'hgroup',
	966	+ 'hr',
	967	+ 'menu',
	968	+ 'nav',
	969	+ 'ol',
	970	+ 'p',
	971	+ 'pre',
	972	+ 'section',
	973	+ 'table',
	974	+ 'ul',
	975	+ ],
	976	+ true
	977	+ )
	978	+ )
	979	+ )
	980	+ );
981	981	}
982	982
983	983	protected function domNodeToString(\DOMNode $node): string
		@@ -1009,9 +1009,9 @@ discard block
		block discarded – undo
1009	1009	}
1010	1010
1011	1011	$html .= '<!DOCTYPE ' . $child->name . ''
1012		- . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
1013		- . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
1014		- . '>';
	1012	+ . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '')
	1013	+ . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '')
	1014	+ . '>';
1015	1015	}
1016	1016	} elseif ($child instanceof \DOMElement) {
1017	1017	$html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child));

		@@ -202,7 +202,7 @@
		block discarded – undo
202	202	continue;
203	203	}
204	204
205		- $attrValue .= \trim($class) . ' ';
	205	+ $attrValue .= \trim($class).' ';
206	206	}
207	207
208	208	return \trim($attrValue);

voku / HtmlMin

Push — master ( 3ca20d...affb1c )

Status

Category

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +115 added lines, -115 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch