lochmueller / sourceopt

Classes/Manipulation/RemoveGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -22,6 +22,6 @@
     public function manipulate($html, array $configuration = [])
     {
         $regex = '<meta name=["\']?generator["\']? [^>]+>';
-        return preg_replace('/' . $regex . '/is', '', $html);
+        return preg_replace('/'.$regex.'/is', '', $html);
     }
 }

Classes/Service/CleanHtmlService.php

Spacing +23 added lines, -23 removed lines

@@ -68,7 +68,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'])) {
@@ -76,14 +76,14 @@ 
             }
 
             if (isset($config['formatHtml.']['debugComment'])) {
-                $this->debugComment = (bool)$config['formatHtml.']['debugComment'];
+                $this->debugComment = (bool) $config['formatHtml.']['debugComment'];
             }
 
             if (isset($config['headerComment'])) {
                 $this->headerComment = $config['headerComment'];
             }
 
-            if (isset($config['dropEmptySpaceChar']) && (bool)$config['dropEmptySpaceChar']) {
+            if (isset($config['dropEmptySpaceChar']) && (bool) $config['dropEmptySpaceChar']) {
                 $this->emptySpaceChar = '';
             }
         }
@@ -100,7 +100,7 @@ 
     public function clean($html, $config = [])
     {
         if (!empty($config)) {
-            if ((bool)$config['enabled'] === false) {
+            if ((bool) $config['enabled'] === false) {
                 return $html;
             }
 
@@ -111,11 +111,11 @@ 
 
         $manipulations = [];
 
-        if (isset($config['removeGenerator']) && (bool)$config['removeGenerator']) {
+        if (isset($config['removeGenerator']) && (bool) $config['removeGenerator']) {
             $manipulations['removeGenerator'] = GeneralUtility::makeInstance(RemoveGenerator::class);
         }
 
-        if (isset($config['removeComments']) && (bool)$config['removeComments']) {
+        if (isset($config['removeComments']) && (bool) $config['removeComments']) {
             $manipulations['removeComments'] = GeneralUtility::makeInstance(RemoveComments::class);
         }
 
@@ -125,12 +125,12 @@ 
 
         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);
         }
 
         // cleanup HTML5 self-closing elements
-        if(!isset($GLOBALS['TSFE']->config['config']['doctype']) || 'x' !== substr($GLOBALS['TSFE']->config['config']['doctype'],0,1)) {
+        if (!isset($GLOBALS['TSFE']->config['config']['doctype']) || 'x' !== substr($GLOBALS['TSFE']->config['config']['doctype'], 0, 1)) {
             $html = preg_replace('/<((?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)\s[^>]+?)\s?\/>/', '<$1>', $html);
         }
 
@@ -183,7 +183,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|!--)';
 
@@ -192,7 +192,7 @@ 
             '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/',
             $html,
             -1,
-            PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+            PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
         );
 
         if ($htmlArrayTemp === false) {
@@ -227,52 +227,52 @@ 
             } elseif ($this->formatType == 2 && ( // minimalistic line break
                     # this element has a line break before itself
                     preg_match(
-                        '/<' . $structureBoxLikeElements . '(.*)>/Usi',
+                        '/<'.$structureBoxLikeElements.'(.*)>/Usi',
                         $htmlArray[$x]
                     ) || preg_match(
-                        '/<' . $structureBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$structureBoxLikeElements.'(.*) \/>/Usi',
                         $htmlArray[$x]
                     ) || # one element before is a element that has a line break after
                     preg_match(
-                        '/<\/' . $structureBoxLikeElements . '(.*)>/Usi',
+                        '/<\/'.$structureBoxLikeElements.'(.*)>/Usi',
                         $htmlArray[$x - 1]
                     ) || substr(
                         $htmlArray[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $structureBoxLikeElements . '(.*) \/>/Usi', $htmlArray[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $htmlArray[$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',
                         $htmlArray[$x]
                     ) || preg_match(
-                        '/<' . $esteticBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$esteticBoxLikeElements.'(.*) \/>/Usi',
                         $htmlArray[$x]
                     ) || # one element before is a element that has a line break after
-                    preg_match('/<\/' . $esteticBoxLikeElements . '(.*)>/Usi', $htmlArray[$x - 1]) || substr(
+                    preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $htmlArray[$x - 1]) || substr(
                         $htmlArray[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $esteticBoxLikeElements . '(.*) \/>/Usi', $htmlArray[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $htmlArray[$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',
                         $htmlArray[$x]
                     ) || preg_match(
-                        '/<' . $allBoxLikeElements . '(.*) \/>/Usi',
+                        '/<'.$allBoxLikeElements.'(.*) \/>/Usi',
                         $htmlArray[$x]
                     ) || # one element before is a element that has a line break after
-                    preg_match('/<\/' . $allBoxLikeElements . '(.*)>/Usi', $htmlArray[$x - 1]) || substr(
+                    preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $htmlArray[$x - 1]) || substr(
                         $htmlArray[$x - 1],
                         0,
                         4
-                    ) == '<!--' || preg_match('/<' . $allBoxLikeElements . '(.*) \/>/Usi', $htmlArray[$x - 1]))
+                    ) == '<!--' || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $htmlArray[$x - 1]))
             ) {
                 $newline = true;
             }
@@ -430,6 +430,6 @@ 
      */
     public function includeHeaderComment(&$html)
     {
-        $html = preg_replace('/^(-->)$/m', "\n\t" . $this->headerComment . "\n$1", $html);
+        $html = preg_replace('/^(-->)$/m', "\n\t".$this->headerComment."\n$1", $html);
     }
 }