@@ -714,7 +714,7 @@ discard block |
||
| 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 | } |
@@ -1008,21 +1008,21 @@ discard block |
||
| 1008 | 1008 | $tmpTypePublic = 'PUBLIC'; |
| 1009 | 1009 | } |
| 1010 | 1010 | |
| 1011 | - $html .= '<!DOCTYPE ' . $child->name . '' |
|
| 1012 | - . ($child->publicId ? ' ' . $tmpTypePublic . ' "' . $child->publicId . '"' : '') |
|
| 1013 | - . ($child->systemId ? ' ' . $tmpTypeSystem . ' "' . $child->systemId . '"' : '') |
|
| 1011 | + $html .= '<!DOCTYPE '.$child->name.'' |
|
| 1012 | + . ($child->publicId ? ' '.$tmpTypePublic.' "'.$child->publicId.'"' : '') |
|
| 1013 | + . ($child->systemId ? ' '.$tmpTypeSystem.' "'.$child->systemId.'"' : '') |
|
| 1014 | 1014 | . '>'; |
| 1015 | 1015 | } |
| 1016 | 1016 | } elseif ($child instanceof \DOMElement) { |
| 1017 | - $html .= \rtrim('<' . $child->tagName . ' ' . $this->domNodeAttributesToString($child)); |
|
| 1018 | - $html .= '>' . $this->domNodeToString($child); |
|
| 1017 | + $html .= \rtrim('<'.$child->tagName.' '.$this->domNodeAttributesToString($child)); |
|
| 1018 | + $html .= '>'.$this->domNodeToString($child); |
|
| 1019 | 1019 | |
| 1020 | 1020 | if ( |
| 1021 | 1021 | !$this->doRemoveOmittedHtmlTags |
| 1022 | 1022 | || |
| 1023 | 1023 | !$this->domNodeClosingTagOptional($child) |
| 1024 | 1024 | ) { |
| 1025 | - $html .= '</' . $child->tagName . '>'; |
|
| 1025 | + $html .= '</'.$child->tagName.'>'; |
|
| 1026 | 1026 | } |
| 1027 | 1027 | |
| 1028 | 1028 | if (!$this->doRemoveWhitespaceAroundTags) { |
@@ -1062,7 +1062,7 @@ discard block |
||
| 1062 | 1062 | $html .= $child->wholeText; |
| 1063 | 1063 | } |
| 1064 | 1064 | } elseif ($child instanceof \DOMComment) { |
| 1065 | - $html .= '<!--' . $child->textContent . '-->'; |
|
| 1065 | + $html .= '<!--'.$child->textContent.'-->'; |
|
| 1066 | 1066 | } |
| 1067 | 1067 | } |
| 1068 | 1068 | |
@@ -1154,8 +1154,8 @@ discard block |
||
| 1154 | 1154 | // Remove extra white-space(s) between HTML attribute(s) |
| 1155 | 1155 | $html = (string) \preg_replace_callback( |
| 1156 | 1156 | '#<([^/\s<>!]+)(?:\s+([^<>]*?)\s*|\s*)(/?)>#u', |
| 1157 | - static function ($matches) { |
|
| 1158 | - return '<' . $matches[1] . \preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#su', ' $1$2', $matches[2]) . $matches[3] . '>'; |
|
| 1157 | + static function($matches) { |
|
| 1158 | + return '<'.$matches[1].\preg_replace('#([^\s=]+)(\=([\'"]?)(.*?)\3)?(\s+|$)#su', ' $1$2', $matches[2]).$matches[3].'>'; |
|
| 1159 | 1159 | }, |
| 1160 | 1160 | $html |
| 1161 | 1161 | ); |
@@ -1170,7 +1170,7 @@ discard block |
||
| 1170 | 1170 | // ------------------------------------------------------------------------- |
| 1171 | 1171 | |
| 1172 | 1172 | $html = (string) \preg_replace_callback( |
| 1173 | - '/<(?<element>' . $this->protectedChildNodesHelper . ')(?<attributes> [^>]*)?>(?<value>.*?)<\/' . $this->protectedChildNodesHelper . '>/', |
|
| 1173 | + '/<(?<element>'.$this->protectedChildNodesHelper.')(?<attributes> [^>]*)?>(?<value>.*?)<\/'.$this->protectedChildNodesHelper.'>/', |
|
| 1174 | 1174 | [$this, 'restoreProtectedHtml'], |
| 1175 | 1175 | $html |
| 1176 | 1176 | ); |
@@ -1189,14 +1189,14 @@ discard block |
||
| 1189 | 1189 | |
| 1190 | 1190 | $html = \str_replace( |
| 1191 | 1191 | [ |
| 1192 | - 'html>' . "\n", |
|
| 1193 | - "\n" . '<html', |
|
| 1194 | - 'html/>' . "\n", |
|
| 1195 | - "\n" . '</html', |
|
| 1196 | - 'head>' . "\n", |
|
| 1197 | - "\n" . '<head', |
|
| 1198 | - 'head/>' . "\n", |
|
| 1199 | - "\n" . '</head', |
|
| 1192 | + 'html>'."\n", |
|
| 1193 | + "\n".'<html', |
|
| 1194 | + 'html/>'."\n", |
|
| 1195 | + "\n".'</html', |
|
| 1196 | + 'head>'."\n", |
|
| 1197 | + "\n".'<head', |
|
| 1198 | + 'head/>'."\n", |
|
| 1199 | + "\n".'</head', |
|
| 1200 | 1200 | ], |
| 1201 | 1201 | [ |
| 1202 | 1202 | 'html>', |
@@ -1215,10 +1215,10 @@ discard block |
||
| 1215 | 1215 | $replace = []; |
| 1216 | 1216 | $replacement = []; |
| 1217 | 1217 | foreach (self::$selfClosingTags as $selfClosingTag) { |
| 1218 | - $replace[] = '<' . $selfClosingTag . '/>'; |
|
| 1219 | - $replacement[] = '<' . $selfClosingTag . '>'; |
|
| 1220 | - $replace[] = '<' . $selfClosingTag . ' />'; |
|
| 1221 | - $replacement[] = '<' . $selfClosingTag . '>'; |
|
| 1218 | + $replace[] = '<'.$selfClosingTag.'/>'; |
|
| 1219 | + $replacement[] = '<'.$selfClosingTag.'>'; |
|
| 1220 | + $replace[] = '<'.$selfClosingTag.' />'; |
|
| 1221 | + $replacement[] = '<'.$selfClosingTag.'>'; |
|
| 1222 | 1222 | } |
| 1223 | 1223 | $html = \str_replace( |
| 1224 | 1224 | $replace, |
@@ -1226,7 +1226,7 @@ discard block |
||
| 1226 | 1226 | $html |
| 1227 | 1227 | ); |
| 1228 | 1228 | |
| 1229 | - $html = (string) \preg_replace('#<\b(' . $CACHE_SELF_CLOSING_TAGS . ')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html); |
|
| 1229 | + $html = (string) \preg_replace('#<\b('.$CACHE_SELF_CLOSING_TAGS.')([^>]*+)><\/\b\1>#', '<\\1\\2>', $html); |
|
| 1230 | 1230 | |
| 1231 | 1231 | // ------------------------------------ |
| 1232 | 1232 | // check if compression worked |
@@ -1333,7 +1333,7 @@ discard block |
||
| 1333 | 1333 | } |
| 1334 | 1334 | |
| 1335 | 1335 | $this->protectedChildNodes[$counter] = $element->innerhtml; |
| 1336 | - $element->getNode()->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>'; |
|
| 1336 | + $element->getNode()->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>'; |
|
| 1337 | 1337 | |
| 1338 | 1338 | ++$counter; |
| 1339 | 1339 | } |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | } |
| 1345 | 1345 | |
| 1346 | 1346 | $this->protectedChildNodes[$counter] = $element->parentNode()->innerHtml(); |
| 1347 | - $element->getNode()->parentNode->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>'; |
|
| 1347 | + $element->getNode()->parentNode->nodeValue = '<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>'; |
|
| 1348 | 1348 | |
| 1349 | 1349 | ++$counter; |
| 1350 | 1350 | } |
@@ -1357,11 +1357,11 @@ discard block |
||
| 1357 | 1357 | continue; |
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | - $this->protectedChildNodes[$counter] = '<!--' . $text . '-->'; |
|
| 1360 | + $this->protectedChildNodes[$counter] = '<!--'.$text.'-->'; |
|
| 1361 | 1361 | |
| 1362 | 1362 | /* @var $node \DOMComment */ |
| 1363 | 1363 | $node = $element->getNode(); |
| 1364 | - $child = new \DOMText('<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $counter . '"></' . $this->protectedChildNodesHelper . '>'); |
|
| 1364 | + $child = new \DOMText('<'.$this->protectedChildNodesHelper.' data-'.$this->protectedChildNodesHelper.'="'.$counter.'"></'.$this->protectedChildNodesHelper.'>'); |
|
| 1365 | 1365 | /** @noinspection UnusedFunctionResultInspection */ |
| 1366 | 1366 | $element->getNode()->parentNode->replaceChild($child, $node); |
| 1367 | 1367 | |