lochmueller / sourceopt

Classes/Manipulation/RemoveGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
     {
         $regex = '<meta name=["\']?generator["\']? [^>]+>';
 
-        return (string) preg_replace('/' . $regex . '/is', '', $html);
+        return (string) preg_replace('/'.$regex.'/is', '', $html);
     }
 }

Classes/Service/RegExRepService.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 
         foreach (['search.', 'replace.'] as $section) {
             if (!isset($config[$section]) || !\is_array($config[$section])) {
-                throw new \Exception('missing entry @ config.replacer.' . $section);
+                throw new \Exception('missing entry @ config.replacer.'.$section);
             }
 
             if (preg_match_all('/"([\w\-]+)\.";/', serialize(array_keys($config[$section])), $matches)) {
@@ -32,10 +32,10 @@ 
                     $config[$section][$key] = $cObj
                         ->stdWrap(
                             $config[$section][$key],
-                            $config[$section][$key . '.']
+                            $config[$section][$key.'.']
                         )
                     ;
-                    unset($config[$section][$key . '.']); // keep!
+                    unset($config[$section][$key.'.']); // keep!
                 }
             }
 
@@ -45,7 +45,7 @@ 
         if (Environment::getContext()->isDevelopment()) {
             foreach ($config['search.'] as $key => $val) {
                 if (false === @preg_match($val, '')) {
-                    throw new \Exception(preg_last_error_msg() . ' : please check your regex syntax @ ' . "{$key} = {$val}");
+                    throw new \Exception(preg_last_error_msg().' : please check your regex syntax @ '."{$key} = {$val}");
                 }
             }
         }

Classes/Service/SvgStoreService.php

Spacing +19 added lines, -19 removed lines

@@ -66,11 +66,11 @@ 
         $this->svgFileArr = $this->svgCache->get('svgFileArr') ?: [];
 
         if (empty($this->spritePath) && !$this->populateCache()) {
-            throw new \Exception('could not write file: ' . $this->sitePath . $this->spritePath);
+            throw new \Exception('could not write file: '.$this->sitePath.$this->spritePath);
         }
 
-        if (!file_exists($this->sitePath . $this->spritePath)) {
-            throw new \Exception('file does not exists: ' . $this->sitePath . $this->spritePath);
+        if (!file_exists($this->sitePath.$this->spritePath)) {
+            throw new \Exception('file does not exists: '.$this->sitePath.$this->spritePath);
         }
     }
 
@@ -87,26 +87,26 @@ 
         }
 
         // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes
-        $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function (array $match): string { // ^[/]
+        $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function(array $match): string { // ^[/]
             if (!isset($this->svgFileArr[$match['src']])) { // check usage
                 return $match[0];
             }
-            $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap|crossorigin|decoding|fetchpriority|referrerpolicy)="[^"]*"/', '', $match['pre'] . $match['post']); // cleanup
+            $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap|crossorigin|decoding|fetchpriority|referrerpolicy)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup
 
             return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['src']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['src']));
         }, $dom['body']);
 
         // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object#attributes
-        $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function (array $match): string { // ^[/]
+        $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function(array $match): string { // ^[/]
             if (!isset($this->svgFileArr[$match['data']])) { // check usage
                 return $match[0];
             }
-            $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/', '', $match['pre'] . $match['post']); // cleanup
+            $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup
 
             return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['data']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['data']));
         }, $dom['body']);
 
-        return $dom['head'] . $dom['body'];
+        return $dom['head'].$dom['body'];
     }
 
     private function convertFilePath(string $path): string
@@ -116,11 +116,11 @@ 
 
     private function addFileToSpriteArr(string $hash, string $path, array $attr = []): ?array
     {
-        if (!file_exists($this->sitePath . $path)) {
+        if (!file_exists($this->sitePath.$path)) {
             return null;
         }
 
-        $svg = file_get_contents($this->sitePath . $path);
+        $svg = file_get_contents($this->sitePath.$path);
 
         if (preg_match('/(?:;base64|i:a?i?pgf)/', $svg)) { // noop!
             return null;
@@ -150,7 +150,7 @@ 
         // }, $svg);
 
         // https://developer.mozilla.org/en-US/docs/Web/SVG/Element/svg#attributes
-        $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function (array $match) use (&$attr): string {
+        $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function(array $match) use (&$attr): string {
             if (false === preg_match_all('/(?!\s)(?<attr>[a-z\-]+)="\s*(?<value>[^"]+)\s*"/i', $match[1], $matches)) {
                 return $match[0];
             }
@@ -197,7 +197,7 @@ 
 
         $fileArr = GeneralUtility::makeInstance(SvgFileRepository::class)->findAllByStorageUids(array_keys($storageArr));
         foreach ($fileArr as $file) {
-            $file['path'] = '/' . $storageArr[$file['storage']] . $file['identifier']; // ^[/]
+            $file['path'] = '/'.$storageArr[$file['storage']].$file['identifier']; // ^[/]
             $file['defs'] = $this->addFileToSpriteArr($file['sha1'], $file['path']);
 
             if (null !== $file['defs']) {
@@ -211,17 +211,17 @@ 
 
         $svg = preg_replace_callback(
             '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)(?:#[^"]*?)?"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s',
-            function (array $match): string {
+            function(array $match): string {
                 if (!isset($this->svgFileArr[$match['href']])) { // check usage
                     return $match[0];
                 }
 
-                return \sprintf('<use%s href="#%s"/>', $match['pre'] . $match['post'], $this->convertFilePath($match['href']));
+                return \sprintf('<use%s href="#%s"/>', $match['pre'].$match['post'], $this->convertFilePath($match['href']));
             },
             '<svg xmlns="http://www.w3.org/2000/svg">'
             // ."\n<style>\n".implode("\n", $this->styl)."\n</style>"
             // ."\n<defs>\n".implode("\n", $this->defs)."\n</defs>"
-            . "\n<symbol " . implode("</symbol>\n<symbol ", $this->svgs) . "</symbol>\n"
+            . "\n<symbol ".implode("</symbol>\n<symbol ", $this->svgs)."</symbol>\n"
             . '</svg>'
         );
 
@@ -234,12 +234,12 @@ 
         $svg = preg_replace('/<([a-z\-]+)\s*(\/|>\s*<\/\1)>\s*|\s+(?=\/>)/i', '', $svg); // remove emtpy TAGs & shorten endings
         $svg = preg_replace('/<((circle|ellipse|line|path|polygon|polyline|rect|stop|use)\s[^>]+?)\s*>\s*<\/\2>/', '<$1/>', $svg); // shorten/minify TAG syntax
 
-        if (!is_dir($this->sitePath . $this->outputDir)) {
-            GeneralUtility::mkdir_deep($this->sitePath . $this->outputDir);
+        if (!is_dir($this->sitePath.$this->outputDir)) {
+            GeneralUtility::mkdir_deep($this->sitePath.$this->outputDir);
         }
 
-        $this->spritePath = $this->outputDir . hash('sha1', serialize($this->svgFileArr)) . '.svg';
-        if (false === file_put_contents($this->sitePath . $this->spritePath, $svg)) {
+        $this->spritePath = $this->outputDir.hash('sha1', serialize($this->svgFileArr)).'.svg';
+        if (false === file_put_contents($this->sitePath.$this->spritePath, $svg)) {
             return false;
         }
 

Classes/Service/CleanHtmlService.php

Spacing +16 added lines, -16 removed lines

@@ -101,7 +101,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);
         }
 
@@ -161,7 +161,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|!--)';
 
@@ -170,7 +170,7 @@ 
             '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/',
             $html,
             -1,
-            \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY
+            \PREG_SPLIT_DELIM_CAPTURE|\PREG_SPLIT_NO_EMPTY
         );
 
         if (false === $htmlArrayTemp) {
@@ -204,52 +204,52 @@ 
             } elseif (2 == $this->formatType && ( // minimalistic line break
                 // this element has a line break before itself
                 preg_match(
-                    '/<' . $structureBoxLikeElements . '(.*)>/Usi',
+                    '/<'.$structureBoxLikeElements.'(.*)>/Usi',
                     $htmlArrayCurrent
                 ) || preg_match(
-                    '/<' . $structureBoxLikeElements . '(.*) \/>/Usi',
+                    '/<'.$structureBoxLikeElements.'(.*) \/>/Usi',
                     $htmlArrayCurrent
                 ) // one element before is a element that has a line break after
                 || preg_match(
-                    '/<\/' . $structureBoxLikeElements . '(.*)>/Usi',
+                    '/<\/'.$structureBoxLikeElements.'(.*)>/Usi',
                     $htmlArrayBefore
                 ) || '<!--' == substr(
                     $htmlArrayBefore,
                     0,
                     4
-                ) || preg_match('/<' . $structureBoxLikeElements . '(.*) \/>/Usi', $htmlArrayBefore))
+                ) || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore))
             ) {
                 $newline = true;
             } elseif (3 == $this->formatType && ( // aestetic line break
                 // this element has a line break before itself
                 preg_match(
-                    '/<' . $esteticBoxLikeElements . '(.*)>/Usi',
+                    '/<'.$esteticBoxLikeElements.'(.*)>/Usi',
                     $htmlArrayCurrent
                 ) || preg_match(
-                    '/<' . $esteticBoxLikeElements . '(.*) \/>/Usi',
+                    '/<'.$esteticBoxLikeElements.'(.*) \/>/Usi',
                     $htmlArrayCurrent
                 ) // one element before is a element that has a line break after
-                || preg_match('/<\/' . $esteticBoxLikeElements . '(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr(
+                || preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr(
                     $htmlArrayBefore,
                     0,
                     4
-                ) || preg_match('/<' . $esteticBoxLikeElements . '(.*) \/>/Usi', $htmlArrayBefore))
+                ) || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore))
             ) {
                 $newline = true;
             } elseif ($this->formatType >= 4 && ( // logical line break
                 // this element has a line break before itself
                 preg_match(
-                    '/<' . $allBoxLikeElements . '(.*)>/Usi',
+                    '/<'.$allBoxLikeElements.'(.*)>/Usi',
                     $htmlArrayCurrent
                 ) || preg_match(
-                    '/<' . $allBoxLikeElements . '(.*) \/>/Usi',
+                    '/<'.$allBoxLikeElements.'(.*) \/>/Usi',
                     $htmlArrayCurrent
                 ) // one element before is a element that has a line break after
-                || preg_match('/<\/' . $allBoxLikeElements . '(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr(
+                || preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr(
                     $htmlArrayBefore,
                     0,
                     4
-                ) || preg_match('/<' . $allBoxLikeElements . '(.*) \/>/Usi', $htmlArrayBefore))
+                ) || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore))
             ) {
                 $newline = true;
             }
@@ -385,6 +385,6 @@ 
      */
     public function includeHeaderComment(string &$html): void
     {
-        $html = preg_replace('/^(-->)$/m', "\n\t" . $this->headerComment . "\n$1", $html);
+        $html = preg_replace('/^(-->)$/m', "\n\t".$this->headerComment."\n$1", $html);
     }
 }