lochmueller / sourceopt

Classes/Middleware/CleanHtmlMiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -38,11 +38,11 @@
     {
         $response = $handler->handle($request);
 
-        if(!($response instanceof NullResponse)
+        if (!($response instanceof NullResponse)
         && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
         && $GLOBALS['TSFE']->isOutputting()
         && false !== (bool) $GLOBALS['TSFE']->config['config']['sourceopt.']['enabled']
-        ){
+        ) {
             $processedHtml = $this->cleanHtmlService->clean(
                 $response->getBody()->__toString(),
                 $GLOBALS['TSFE']->config['config']['sourceopt.']

Classes/Middleware/SvgStoreMiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
     {
         $response = $handler->handle($request);
 
-        if(!($response instanceof NullResponse)
+        if (!($response instanceof NullResponse)
         && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
         && $GLOBALS['TSFE']->isOutputting()
         && false !== (bool) $GLOBALS['TSFE']->config['config']['svgstore.']['enabled']
-        ){
+        ) {
             $processedHtml = GeneralUtility::makeInstance(\HTML\Sourceopt\Service\SvgStoreService::class)
                                                           ->process($response->getBody()->__toString());
 

Classes/Service/CleanHtmlService.php

Spacing +21 added lines, -21 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 = '';
             }
         }
@@ -107,11 +107,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);
         }
 
@@ -121,7 +121,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);
         }
 
@@ -184,7 +184,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|!--)';
 
@@ -193,7 +193,7 @@ 
             '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/',
             $html,
             -1,
-            PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+            PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
         );
 
         if ($htmlArrayTemp === false) {
@@ -223,52 +223,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;
             }
@@ -426,6 +426,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);
     }
 }

Classes/Service/SvgStoreService.php

Spacing +44 added lines, -45 removed lines

@@ -17,7 +17,7 @@ 
    *
    * @var string
    */
-  protected $outputDir  = '/typo3temp/assets/svg/';// fallback
+  protected $outputDir = '/typo3temp/assets/svg/'; // fallback
 
   public function __construct()
   {
@@ -25,11 +25,11 @@ 
     #$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']))
+    if (isset($GLOBALS['TSFE']->config['config']['svgstore.']['outputDir']) && !empty($GLOBALS['TSFE']->config['config']['svgstore.']['outputDir']))
     {
-      $this->outputDir  = '/typo3temp/'.$GLOBALS['TSFE']->config['config']['svgstore.']['outputDir'];
+      $this->outputDir = '/typo3temp/'.$GLOBALS['TSFE']->config['config']['svgstore.']['outputDir'];
     }
 
     $this->connPool   = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ConnectionPool::class);
@@ -40,43 +40,43 @@ 
     $this->spritePath = $this->svgCache->get('spritePath');
     $this->svgFileArr = $this->svgCache->get('svgFileArr');
 
-    if(empty($this->spritePath) && !$this->populateCache())
+    if (empty($this->spritePath) && !$this->populateCache())
     {
       throw new \Exception('could not write file: '.$this->sitePath.$this->spritePath);
     }
 
-    if(!file_exists($this->sitePath.$this->spritePath))
+    if (!file_exists($this->sitePath.$this->spritePath))
     {
       throw new \Exception('file does not exists: '.$this->sitePath.$this->spritePath);
     }
 
-    if(!preg_match('/(?<head>.+?<\/head>)(?<body>.+)/s',$html,$html) && count($html) == 5)
+    if (!preg_match('/(?<head>.+?<\/head>)(?<body>.+)/s', $html, $html) && count($html) == 5)
     {
       throw new \Exception('fix HTML!');
     }
 
     // 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
+      if (!isset($this->svgFileArr[$matches['src']]))// check usage
       {
         return $matches[0];
       }
 
-      $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap)="[^"]*"/','',$matches['pre'].$matches['post']);// cleanup
+      $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap)="[^"]*"/', '', $matches['pre'].$matches['post']); // cleanup
 
       return sprintf('<svg%s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$matches['src']]['attr'], $attr, $this->spritePath, $this->convertFilePath($matches['src']));
     },$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
+      if (!isset($this->svgFileArr[$matches['data']]))// check usage
       {
         return $matches[0];
       }
 
-      $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/','',$matches['pre'].$matches['post']);// cleanup
+      $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/', '', $matches['pre'].$matches['post']); // cleanup
 
       return sprintf('<svg%s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$matches['src']]['attr'], $attr, $this->spritePath, $this->convertFilePath($matches['data']));
     },$html['body']);
@@ -86,21 +86,21 @@ 
 
   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
   {
-    if(1 === preg_match('/;base64/',$svg = file_get_contents($this->sitePath.$path)))// noop!
+    if (1 === preg_match('/;base64/', $svg = file_get_contents($this->sitePath.$path)))// noop!
     {
       return null;
     }
 
-    if(1 === preg_match('/<(?:style|defs|url\()/',$svg))# check links @ __construct
+    if (1 === preg_match('/<(?:style|defs|url\()/', $svg))# check links @ __construct
     {
       return null;
     }
 
-    $svg = preg_replace('/<\/svg>.*|xlink:|\s(?:(?:width|height|version|xmlns)|(?:[a-z\-]+\:[a-z\-]+))="[^"]*"/s','',$svg);// clean !?: \s+(?<atr>[\w\-]+)=["\'](?<val>[^"\']+)["\']
+    $svg = preg_replace('/<\/svg>.*|xlink:|\s(?:(?:width|height|version|xmlns)|(?:[a-z\-]+\:[a-z\-]+))="[^"]*"/s', '', $svg); // clean !?: \s+(?<atr>[\w\-]+)=["\'](?<val>[^"\']+)["\']
 
     #$svg = preg_replace('/((?:id|class)=")/','$1'.$hash.'__',$svg);// extend  IDs
     #$svg = preg_replace('/(href="|url\()#/','$1#'.$hash.'__',$svg);// recover IDs
@@ -118,9 +118,9 @@ 
     #  return '';
     #},$svg);
 
-    $this->svgs[] = preg_replace('/.*<svg((?:(?!id=)[^>])+)(?:id="[^"]*")?([^>]*>)/s','id="'.$this->convertFilePath($path).'"$1$2',$svg, 1);// change ID;
+    $this->svgs[] = preg_replace('/.*<svg((?:(?!id=)[^>])+)(?:id="[^"]*")?([^>]*>)/s', 'id="'.$this->convertFilePath($path).'"$1$2', $svg, 1); // change ID;
 
-    return preg_match('/\s+viewBox="\s*([+-]?[\d\.]+(?:\s+[+-]?[\d\.]+){3})\s*"/',$svg,$match) ? ['attr' => ' viewBox="'.preg_replace('/\s+/',' ',$match[1]).'"', 'hash' => $hash] : null;
+    return preg_match('/\s+viewBox="\s*([+-]?[\d\.]+(?:\s+[+-]?[\d\.]+){3})\s*"/', $svg, $match) ? ['attr' => ' viewBox="'.preg_replace('/\s+/', ' ', $match[1]).'"', 'hash' => $hash] : null;
   }
 
   private function populateCache(): bool
@@ -129,55 +129,54 @@ 
     $svgFileArr = $this->getSvgFilesArrayFromDB(array_keys($storageArr));
 
     $this->svgFileArr = [];
-    foreach($svgFileArr as $index => $row)
+    foreach ($svgFileArr as $index => $row)
     {
-      if(!$this->svgFileArr[($row['path'] = '/'.$storageArr[$row['storage']].$row['identifier'])] = $this->addFileToSpriteArr($row['sha1'], $row['path']))// ^[/]
+      if (!$this->svgFileArr[($row['path'] = '/'.$storageArr[$row['storage']].$row['identifier'])] = $this->addFileToSpriteArr($row['sha1'], $row['path']))// ^[/]
       {
         unset($this->svgFileArr[$row['path']]);
       }
     }
 
 
-    $svg = preg_replace_callback
-    (
-      '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)#[^"]+"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s',function(array $matches): string
+    $svg = preg_replace_callback(
+      '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)#[^"]+"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s', 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">'
       #."\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>'
     );
 
     #unset($this->styl);// save MEM
     #unset($this->defs);// save MEM
-    unset($this->svgs);// save MEM
+    unset($this->svgs); // save MEM
 
-    if(is_int($var = $GLOBALS['TSFE']->config['config']['sourceopt.']['formatHtml']) && $var == 1)
+    if (is_int($var = $GLOBALS['TSFE']->config['config']['sourceopt.']['formatHtml']) && $var == 1)
     {
-      $svg = preg_replace('/[\n\r\t\v\0]|\s{2,}/','',$svg);
+      $svg = preg_replace('/[\n\r\t\v\0]|\s{2,}/', '', $svg);
     }
 
-    $svg = preg_replace('/<([a-z]+)\s*(\/|>\s*<\/\1)>\s*/i','',$svg);// remove emtpy
-    $svg = preg_replace('/<((circle|ellipse|line|path|polygon|polyline|rect|stop|use)\s[^>]+?)\s*>\s*<\/\2>/','<$1/>',$svg);// shorten/minify
+    $svg = preg_replace('/<([a-z]+)\s*(\/|>\s*<\/\1)>\s*/i', '', $svg); // remove emtpy
+    $svg = preg_replace('/<((circle|ellipse|line|path|polygon|polyline|rect|stop|use)\s[^>]+?)\s*>\s*<\/\2>/', '<$1/>', $svg); // shorten/minify
 
 
-    if(!is_dir($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;
     }
-    unset($svg);// save MEM
+    unset($svg); // save MEM
 
-    $this->svgCache->set('svgFileArr',$this->svgFileArr);
-    $this->svgCache->set('spritePath',$this->spritePath);
+    $this->svgCache->set('svgFileArr', $this->svgFileArr);
+    $this->svgCache->set('spritePath', $this->spritePath);
 
     return true;
   }
@@ -185,34 +184,34 @@ 
   private function getStorageArrayFromDB(): array
   {
     $storageResources = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findAll();
-    foreach($storageResources as $storage)
+    foreach ($storageResources as $storage)
     {
-      if($storage->getConfiguration()['pathType'] == 'relative')
+      if ($storage->getConfiguration()['pathType'] == 'relative')
       {
-        $storageResources[$storage->getUid()] = rtrim($storage->getConfiguration()['basePath'],'/');// [^/]$
+        $storageResources[$storage->getUid()] = rtrim($storage->getConfiguration()['basePath'], '/'); // [^/]$
       }
     }
 
-    unset($storageResources[0]);// keep!
+    unset($storageResources[0]); // keep!
     return $storageResources;
   }
   private function getSvgFilesArrayFromDB(array $storageIds): array
   {
     return ($queryBuilder = $this->connPool->getQueryBuilderForTable('sys_file'))
-              ->select('sys_file.storage','sys_file.identifier','sys_file.sha1')
+              ->select('sys_file.storage', 'sys_file.identifier', 'sys_file.sha1')
               ->from('sys_file')
-              ->innerJoin('sys_file','sys_file_reference','sys_file_reference',
+              ->innerJoin('sys_file', 'sys_file_reference', 'sys_file_reference',
                 $queryBuilder->expr()->eq('sys_file_reference.uid_local',
                 $queryBuilder->quoteIdentifier('sys_file.uid'))
                 )
               ->where(
-                $queryBuilder->expr()->in('sys_file.storage',   $queryBuilder->createNamedParameter($storageIds,\TYPO3\CMS\Core\Database\Connection::PARAM_INT_ARRAY)),
+                $queryBuilder->expr()->in('sys_file.storage', $queryBuilder->createNamedParameter($storageIds, \TYPO3\CMS\Core\Database\Connection::PARAM_INT_ARRAY)),
                 $queryBuilder->expr()->eq('sys_file.mime_type', $queryBuilder->createNamedParameter('image/svg+xml')),
-                $queryBuilder->expr()->lt('sys_file.size',      $queryBuilder->createNamedParameter($GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'])),
+                $queryBuilder->expr()->lt('sys_file.size', $queryBuilder->createNamedParameter($GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'])),
                 )
               ->groupBy('sys_file.uid')
               ->orderBy('sys_file.uid')
               ->execute()
-              ->fetchAll();// TODO; use stdClass
+              ->fetchAll(); // TODO; use stdClass
   }
 }