lochmueller / sourceopt

Classes/Service/CleanHtmlService.php

Spacing +26 added lines, -26 removed lines

@@ -74,7 +74,7 @@ 
 
         if (!empty($config)) {
             if ($config['formatHtml'] && is_numeric($config['formatHtml'])) {
-                $this->formatType = (int)$config['formatHtml'];
+                $this->formatType = (int) $config['formatHtml'];
             }
 
             if ($config['formatHtml.']['tabSize'] && is_numeric($config['formatHtml.']['tabSize'])) {
@@ -82,11 +82,11 @@ 
             }
 
             if (isset($config['enable_utf'])) {
-                $this->utf8 = (bool)$config['enable_utf-8_support'];
+                $this->utf8 = (bool) $config['enable_utf-8_support'];
             }
 
             if (isset($config['formatHtml.']['debugComment'])) {
-                $this->debugComment = (bool)$config['formatHtml.']['debugComment'];
+                $this->debugComment = (bool) $config['formatHtml.']['debugComment'];
             }
 
             if (isset($config['headerComment'])) {
@@ -106,7 +106,7 @@ 
     public function clean(&$html, $config = [])
     {
         if (!empty($config)) {
-            if ((bool)$config['enabled'] === false) {
+            if ((bool) $config['enabled'] === false) {
                 return;
             }
 
@@ -115,15 +115,15 @@ 
 
         $manipulations = [];
 
-        if (isset($config['removeGenerator']) && (bool)$config['removeGenerator']) {
+        if (isset($config['removeGenerator']) && (bool) $config['removeGenerator']) {
             $manipulations['removeGenerator'] = GeneralUtility::makeInstance('HTML\\Sourceopt\\Manipulation\\RemoveGenerator');
         }
 
-        if (isset($config['removeComments']) && (bool)$config['removeComments']) {
+        if (isset($config['removeComments']) && (bool) $config['removeComments']) {
             $manipulations['removeComments'] = GeneralUtility::makeInstance('HTML\\Sourceopt\\Manipulation\\RemoveComments');
         }
 
-        if (isset($config['removeBlurScript']) && (bool)$config['removeBlurScript']) {
+        if (isset($config['removeBlurScript']) && (bool) $config['removeBlurScript']) {
             $manipulations['removeBlurScript'] = GeneralUtility::makeInstance('HTML\\Sourceopt\\Manipulation\\RemoveBlurScript');
         }
 
@@ -133,7 +133,7 @@ 
 
         foreach ($manipulations as $key => $manipulation) {
             /** @var ManipulationInterface $manipulation */
-            $configuration = isset($config[$key . '.']) && is_array($config[$key . '.']) ? $config[$key . '.'] : [];
+            $configuration = isset($config[$key.'.']) && is_array($config[$key.'.']) ? $config[$key.'.'] : [];
             $html = $manipulation->manipulate($html, $configuration);
         }
 
@@ -177,7 +177,7 @@ 
         $functionalBoxElements = 'dd|dt|frameset|li|tbody|td|tfoot|th|thead|tr|colgroup';
         $usableBoxElements = 'applet|button|del|iframe|ins|map|object|script';
         $imagineBoxElements = 'html|body|head|meta|title|link|script|base|!--';
-        $allBoxLikeElements = '(?>' . $trueBoxElements . '|' . $functionalBoxElements . '|' . $usableBoxElements . '|' . $imagineBoxElements . ')';
+        $allBoxLikeElements = '(?>'.$trueBoxElements.'|'.$functionalBoxElements.'|'.$usableBoxElements.'|'.$imagineBoxElements.')';
         $esteticBoxLikeElements = '(?>html|head|body|meta name|title|div|table|h1|h2|h3|h4|h5|h6|p|form|pre|center|!--)';
         $structureBoxLikeElements = '(?>html|head|body|div|!--)';
 
@@ -186,7 +186,7 @@ 
             '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/',
             $html,
             -1,
-            PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+            PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
         );
         // remove empty lines
         $html_array = [''];
@@ -215,52 +215,52 @@ 
             } elseif ($this->formatType == 2 && ( // minimalistic line break
                     # this element has a line break before itself
                     preg_match(
-                        '/<' . $structureBoxLikeElements . '(.*)>/Usi',
+                        '/<'.$structureBoxLikeElements.'(.*)>/Usi',
                         $html_array[$x]
                     ) || preg_match(
-                        '/<' . $structureBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$structureBoxLikeElements.'(.*) \/>/Usi',
                         $html_array[$x]
                     ) || # one element before is a element that has a line break after
                     preg_match(
-                        '/<\/' . $structureBoxLikeElements . '(.*)>/Usi',
+                        '/<\/'.$structureBoxLikeElements.'(.*)>/Usi',
                         $html_array[$x - 1]
                     ) || substr(
                         $html_array[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $structureBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
             ) {
                 $newline = true;
             } elseif ($this->formatType == 3 && ( // aestetic line break
                     # this element has a line break before itself
                     preg_match(
-                        '/<' . $esteticBoxLikeElements . '(.*)>/Usi',
+                        '/<'.$esteticBoxLikeElements.'(.*)>/Usi',
                         $html_array[$x]
                     ) || preg_match(
-                        '/<' . $esteticBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$esteticBoxLikeElements.'(.*) \/>/Usi',
                         $html_array[$x]
                     ) || # one element before is a element that has a line break after
-                    preg_match('/<\/' . $esteticBoxLikeElements . '(.*)>/Usi', $html_array[$x - 1]) || substr(
+                    preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $html_array[$x - 1]) || substr(
                         $html_array[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $esteticBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
             ) {
                 $newline = true;
             } elseif ($this->formatType >= 4 && ( // logical line break
                     # this element has a line break before itself
                     preg_match(
-                        '/<' . $allBoxLikeElements . '(.*)>/Usi',
+                        '/<'.$allBoxLikeElements.'(.*)>/Usi',
                         $html_array[$x]
                     ) || preg_match(
-                        '/<' . $allBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$allBoxLikeElements.'(.*) \/>/Usi',
                         $html_array[$x]
                     ) || # one element before is a element that has a line break after
-                    preg_match('/<\/' . $allBoxLikeElements . '(.*)>/Usi', $html_array[$x - 1]) || substr(
+                    preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $html_array[$x - 1]) || substr(
                         $html_array[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $allBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
             ) {
                 $newline = true;
             }
@@ -337,7 +337,7 @@ 
 
         // include debug comment at the end
         if ($tabs != 0 && $this->debugComment === true) {
-            $html .= '<!--' . $tabs . " open elements found-->\r\n";
+            $html .= '<!--'.$tabs." open elements found-->\r\n";
         }
     }
 
@@ -471,7 +471,7 @@ 
             'textarea',
             'pre'
         ]; // eventuell auch: span, script, style
-        $peaces = preg_split('#(<(' . implode('|', $splitArray) . ').*>.*</\2>)#Uis', $html, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $peaces = preg_split('#(<('.implode('|', $splitArray).').*>.*</\2>)#Uis', $html, -1, PREG_SPLIT_DELIM_CAPTURE);
         $html = "";
         for ($i = 0; $i < count($peaces); $i++) {
             if (($i + 1) % 3 == 0) {
@@ -525,8 +525,8 @@ 
     public function includeHeaderComment(&$html)
     {
         if (!empty($this->headerComment)) {
-            $html = preg_replace_callback('/<meta http-equiv(.*)>/Usi', function ($matches) {
-                return trim($matches[0] . $this->newline . $this->tab . $this->tab . '<!-- ' . $this->headerComment . '-->');
+            $html = preg_replace_callback('/<meta http-equiv(.*)>/Usi', function($matches) {
+                return trim($matches[0].$this->newline.$this->tab.$this->tab.'<!-- '.$this->headerComment.'-->');
             }, $html, 1);
         }
     }

Classes/User/FrontendHook.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      *
      * @return void
      */
-    public function clean(TypoScriptFrontendController &$typoScriptFrontend)
+    public function clean(TypoScriptFrontendController&$typoScriptFrontend)
     {
         if ($this->cleanHtmlService instanceof CleanHtmlService) {
             $configuration = $typoScriptFrontend->config['config']['sourceopt.'];