lochmueller / sourceopt

Classes/Service/CleanHtmlService.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
             '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/',
             $html,
             -1,
-            \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY
+            \PREG_SPLIT_DELIM_CAPTURE|\PREG_SPLIT_NO_EMPTY
         );
 
         if (false === $htmlArrayTemp) {

Classes/Service/SvgStoreService.php

Spacing +8 added lines, -8 removed lines

@@ -25,10 +25,10 @@ 
         #$this->defs = []; # https://bugs.chromium.org/p/chromium/issues/detail?id=751733#c14
         $this->svgs = [];
 
-        $this->sitePath = \TYPO3\CMS\Core\Core\Environment::getPublicPath();// [^/]$
+        $this->sitePath = \TYPO3\CMS\Core\Core\Environment::getPublicPath(); // [^/]$
 
         if (isset($GLOBALS['TSFE']->config['config']['svgstore.']['outputDir']) && !empty($GLOBALS['TSFE']->config['config']['svgstore.']['outputDir'])) {
-            $this->outputDir = '/typo3temp/'.$GLOBALS['TSFE']->config['config']['svgstore.']['outputDir'];// TODO; please beautify
+            $this->outputDir = '/typo3temp/'.$GLOBALS['TSFE']->config['config']['svgstore.']['outputDir']; // TODO; please beautify
         }
 
         $this->connPool = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ConnectionPool::class);
@@ -53,7 +53,7 @@ 
         }
 
         # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes
-        $html['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>/s', function (array $matches): string {// ^[/]
+        $html['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>/s', function(array $matches): string {// ^[/]
             if (!isset($this->svgFileArr[$matches['src']])) { // check usage
                 return $matches[0];
             }
@@ -63,7 +63,7 @@ 
         }, $html['body']);
 
         # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object#attributes
-        $html['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function (array $matches): string {// ^[/]
+        $html['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function(array $matches): string {// ^[/]
             if (!isset($this->svgFileArr[$matches['data']])) { // check usage
                 return $matches[0];
             }
@@ -77,7 +77,7 @@ 
 
     private function convertFilePath(string $path): string
     {
-        return preg_replace('/.svg$|[^\w\-]/', '', str_replace('/', '-', ltrim($path, '/')));// ^[^/]
+        return preg_replace('/.svg$|[^\w\-]/', '', str_replace('/', '-', ltrim($path, '/'))); // ^[^/]
     }
 
     private function addFileToSpriteArr(string $hash, string $path): ?array
@@ -87,7 +87,7 @@ 
         }
 
         if (1 === preg_match('/<(?:style|defs|url\()/', $svg)) {
-            return null;# check links @ __construct
+            return null; # check links @ __construct
         }
 
         $svg = preg_replace('/<\/svg>.*|xlink:|\s(?:(?:width|height|version|xmlns)|(?:[a-z\-]+\:[a-z\-]+))="[^"]*"/s', '', $svg); // clean !?: \s+(?<atr>[\w\-]+)=["\'](?<val>[^"\']+)["\']
@@ -126,7 +126,7 @@ 
 
         $svg = preg_replace_callback(
             '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)#[^"]+"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s',
-            function (array $matches): string {
+            function(array $matches): string {
                 return sprintf('<use%s href="#%s"/>', $matches['pre'].$matches['post'], $this->convertFilePath($matches['href']));
             },
             '<svg xmlns="http://www.w3.org/2000/svg">'
@@ -168,7 +168,7 @@ 
         $storageResources = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findAll();
         foreach ($storageResources as $storage) {
             if ('relative' == $storage->getConfiguration()['pathType']) {
-                $storageResources[$storage->getUid()] = rtrim($storage->getConfiguration()['basePath'], '/');// [^/]$
+                $storageResources[$storage->getUid()] = rtrim($storage->getConfiguration()['basePath'], '/'); // [^/]$
             }
         }
         unset($storageResources[0]); // keep!