lochmueller / sourceopt

Classes/Manipulation/RemoveComments.php

Indentation +51 added lines, -51 removed lines

@@ -6,61 +6,61 @@
 
 class RemoveComments implements ManipulationInterface
 {
-    /**
-     * Patterns for white-listing comments inside content.
-     */
-    protected array $whiteListCommentsPatterns = [];
+	/**
+	 * Patterns for white-listing comments inside content.
+	 */
+	protected array $whiteListCommentsPatterns = [];
 
-    /**
-     * @param string $html          The original HTML
-     * @param array  $configuration Configuration
-     *
-     * @return string the manipulated HTML
-     */
-    public function manipulate(string $html, array $configuration = []): string
-    {
-        if (isset($configuration['keep.'])) {
-            $this->whiteListCommentsPatterns = $configuration['keep.'];
-        }
+	/**
+	 * @param string $html          The original HTML
+	 * @param array  $configuration Configuration
+	 *
+	 * @return string the manipulated HTML
+	 */
+	public function manipulate(string $html, array $configuration = []): string
+	{
+		if (isset($configuration['keep.'])) {
+			$this->whiteListCommentsPatterns = $configuration['keep.'];
+		}
 
-        // match all comments, styles and scripts
-        $matches = [];
-        preg_match_all(
-            '/(?s)((<!--.*?-->)|(<[ \n\r]*style[^>]*>.*?<[ \n\r]*\/style[^>]*>)|(<[ \n\r]*script[^>]*>.*?<[ \n\r]*\/script[^>]*>))/im',
-            $html,
-            $matches
-        );
-        foreach ($matches[0] as $tag) {
-            if (false === $this->keepComment($tag)) {
-                $html = str_replace($tag, '', $html);
-            }
-        }
+		// match all comments, styles and scripts
+		$matches = [];
+		preg_match_all(
+			'/(?s)((<!--.*?-->)|(<[ \n\r]*style[^>]*>.*?<[ \n\r]*\/style[^>]*>)|(<[ \n\r]*script[^>]*>.*?<[ \n\r]*\/script[^>]*>))/im',
+			$html,
+			$matches
+		);
+		foreach ($matches[0] as $tag) {
+			if (false === $this->keepComment($tag)) {
+				$html = str_replace($tag, '', $html);
+			}
+		}
 
-        return $html;
-    }
+		return $html;
+	}
 
-    /**
-     * Check if a comment is defined to be kept in a pattern whiteListOfComments.
-     */
-    protected function keepComment(string $commentHtml): bool
-    {
-        // if not even a comment, skip this
-        if (!preg_match('/^\<\!\-\-(.*?)\-\-\>$/usi', $commentHtml)) {
-            return true;
-        }
+	/**
+	 * Check if a comment is defined to be kept in a pattern whiteListOfComments.
+	 */
+	protected function keepComment(string $commentHtml): bool
+	{
+		// if not even a comment, skip this
+		if (!preg_match('/^\<\!\-\-(.*?)\-\-\>$/usi', $commentHtml)) {
+			return true;
+		}
 
-        // if not defined in white list
-        if (!empty($this->whiteListCommentsPatterns)) {
-            $commentHtml = str_replace('<!--', '', $commentHtml);
-            $commentHtml = str_replace('-->', '', $commentHtml);
-            $commentHtml = trim($commentHtml);
-            foreach ($this->whiteListCommentsPatterns as $pattern) {
-                if (!empty($pattern) && preg_match($pattern, $commentHtml)) {
-                    return true;
-                }
-            }
-        }
+		// if not defined in white list
+		if (!empty($this->whiteListCommentsPatterns)) {
+			$commentHtml = str_replace('<!--', '', $commentHtml);
+			$commentHtml = str_replace('-->', '', $commentHtml);
+			$commentHtml = trim($commentHtml);
+			foreach ($this->whiteListCommentsPatterns as $pattern) {
+				if (!empty($pattern) && preg_match($pattern, $commentHtml)) {
+					return true;
+				}
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Classes/Manipulation/ManipulationInterface.php

Indentation +7 added lines, -7 removed lines

@@ -6,11 +6,11 @@
 
 interface ManipulationInterface
 {
-    /**
-     * @param string $html          The original HTML
-     * @param array  $configuration Configuration
-     *
-     * @return string the manipulated HTML
-     */
-    public function manipulate(string $html, array $configuration = []): string;
+	/**
+	 * @param string $html          The original HTML
+	 * @param array  $configuration Configuration
+	 *
+	 * @return string the manipulated HTML
+	 */
+	public function manipulate(string $html, array $configuration = []): string;
 }

Classes/Resource/SvgFileRepository.php

Indentation +39 added lines, -39 removed lines

@@ -14,44 +14,44 @@
  */
 class SvgFileRepository
 {
-    /**
-     * Retrieves all used SVGs within given storage-array.
-     */
-    public function findAllByStorageUids(array $storageUids): \Traversable
-    {
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file');
+	/**
+	 * Retrieves all used SVGs within given storage-array.
+	 */
+	public function findAllByStorageUids(array $storageUids): \Traversable
+	{
+		$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file');
 
-        return $queryBuilder
-            ->select('sys_file.storage', 'sys_file.identifier', 'sys_file.sha1')
-            ->from('sys_file')
-            ->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($storageUids, \TYPO3\CMS\Core\Database\Connection::PARAM_INT_ARRAY)
-                ),
-                $queryBuilder->expr()->lt(
-                    'sys_file.size',
-                    $queryBuilder->createNamedParameter((int) $GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'] ?? null, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)
-                ),
-                $queryBuilder->expr()->eq(
-                    'sys_file.mime_type',
-                    $queryBuilder->createNamedParameter('image/svg+xml', \TYPO3\CMS\Core\Database\Connection::PARAM_STR)
-                )
-            )
-            ->groupBy('sys_file.uid', 'sys_file.storage', 'sys_file.identifier', 'sys_file.sha1')
-            ->orderBy('sys_file.storage')
-            ->addOrderBy('sys_file.identifier')
-            ->execute()
-            ->iterateAssociative()
-        ;
-    }
+		return $queryBuilder
+			->select('sys_file.storage', 'sys_file.identifier', 'sys_file.sha1')
+			->from('sys_file')
+			->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($storageUids, \TYPO3\CMS\Core\Database\Connection::PARAM_INT_ARRAY)
+				),
+				$queryBuilder->expr()->lt(
+					'sys_file.size',
+					$queryBuilder->createNamedParameter((int) $GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'] ?? null, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)
+				),
+				$queryBuilder->expr()->eq(
+					'sys_file.mime_type',
+					$queryBuilder->createNamedParameter('image/svg+xml', \TYPO3\CMS\Core\Database\Connection::PARAM_STR)
+				)
+			)
+			->groupBy('sys_file.uid', 'sys_file.storage', 'sys_file.identifier', 'sys_file.sha1')
+			->orderBy('sys_file.storage')
+			->addOrderBy('sys_file.identifier')
+			->execute()
+			->iterateAssociative()
+		;
+	}
 }

Classes/Middleware/AbstractMiddleware.php

Indentation +28 added lines, -28 removed lines

@@ -13,32 +13,32 @@
 
 abstract class AbstractMiddleware implements MiddlewareInterface
 {
-    protected function responseIsAlterable(ResponseInterface $response): bool
-    {
-        if (!$response instanceof NullResponse) {
-            return false;
-        }
-
-        if (!$GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {  // need for configuration
-            return false;
-        }
-
-        if ('text/html' !== substr($response->getHeaderLine('Content-Type'), 0, 9)) {
-            return false;
-        }
-
-        if (empty($response->getBody())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    protected function getStringStream(string $content): StreamInterface
-    {
-        $body = new Stream('php://temp', 'rw');
-        $body->write($content);
-
-        return $body;
-    }
+	protected function responseIsAlterable(ResponseInterface $response): bool
+	{
+		if (!$response instanceof NullResponse) {
+			return false;
+		}
+
+		if (!$GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {  // need for configuration
+			return false;
+		}
+
+		if ('text/html' !== substr($response->getHeaderLine('Content-Type'), 0, 9)) {
+			return false;
+		}
+
+		if (empty($response->getBody())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	protected function getStringStream(string $content): StreamInterface
+	{
+		$body = new Stream('php://temp', 'rw');
+		$body->write($content);
+
+		return $body;
+	}
 }

Classes/Manipulation/RemoveGenerator.php

Indentation +11 added lines, -11 removed lines

@@ -6,16 +6,16 @@
 
 class RemoveGenerator implements ManipulationInterface
 {
-    /**
-     * @param string $html          The original HTML
-     * @param array  $configuration Configuration
-     *
-     * @return string the manipulated HTML
-     */
-    public function manipulate(string $html, array $configuration = []): string
-    {
-        $regex = '<meta name=["\']?generator["\']? [^>]+>';
+	/**
+	 * @param string $html          The original HTML
+	 * @param array  $configuration Configuration
+	 *
+	 * @return string the manipulated HTML
+	 */
+	public function manipulate(string $html, array $configuration = []): string
+	{
+		$regex = '<meta name=["\']?generator["\']? [^>]+>';
 
-        return (string) preg_replace('/' . $regex . '/is', '', $html);
-    }
+		return (string) preg_replace('/' . $regex . '/is', '', $html);
+	}
 }

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/Middleware/SvgStoreMiddleware.php

Indentation +13 added lines, -13 removed lines

@@ -11,20 +11,20 @@
 
 class SvgStoreMiddleware extends AbstractMiddleware
 {
-    public function __construct(protected SvgStoreService $svgStoreService) {}
+	public function __construct(protected SvgStoreService $svgStoreService) {}
 
-    /**
-     * Search/Extract/Merge SVGs @ HTML output.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $response = $handler->handle($request);
+	/**
+	 * Search/Extract/Merge SVGs @ HTML output.
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$response = $handler->handle($request);
 
-        if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['svgstore.']['enabled'] ?? false) {
-            $processedHtml = $this->svgStoreService->process((string) $response->getBody());
-            $response = $response->withBody($this->getStringStream($processedHtml));
-        }
+		if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['svgstore.']['enabled'] ?? false) {
+			$processedHtml = $this->svgStoreService->process((string) $response->getBody());
+			$response = $response->withBody($this->getStringStream($processedHtml));
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 }

Classes/Middleware/CleanHtmlMiddleware.php

Indentation +16 added lines, -16 removed lines

@@ -11,23 +11,23 @@
 
 class CleanHtmlMiddleware extends AbstractMiddleware
 {
-    public function __construct(protected CleanHtmlService $cleanHtmlService) {}
+	public function __construct(protected CleanHtmlService $cleanHtmlService) {}
 
-    /**
-     * Clean the HTML output.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $response = $handler->handle($request);
+	/**
+	 * Clean the HTML output.
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$response = $handler->handle($request);
 
-        if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['sourceopt.']['enabled'] ?? false) {
-            $processedHtml = $this->cleanHtmlService->clean(
-                (string) $response->getBody(),
-                (array) $GLOBALS['TSFE']->config['config']['sourceopt.']
-            );
-            $response = $response->withBody($this->getStringStream($processedHtml));
-        }
+		if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['sourceopt.']['enabled'] ?? false) {
+			$processedHtml = $this->cleanHtmlService->clean(
+				(string) $response->getBody(),
+				(array) $GLOBALS['TSFE']->config['config']['sourceopt.']
+			);
+			$response = $response->withBody($this->getStringStream($processedHtml));
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 }

Classes/Middleware/RegExRepMiddleware.php

Indentation +13 added lines, -13 removed lines

@@ -11,20 +11,20 @@
 
 class RegExRepMiddleware extends AbstractMiddleware
 {
-    public function __construct(protected RegExRepService $regExRepService) {}
+	public function __construct(protected RegExRepService $regExRepService) {}
 
-    /**
-     * RegEx search & replace @ HTML output.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $response = $handler->handle($request);
+	/**
+	 * RegEx search & replace @ HTML output.
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$response = $handler->handle($request);
 
-        if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['replacer.'] ?? false) {
-            $processedHtml = $this->regExRepService->process((string) $response->getBody());
-            $response = $response->withBody($this->getStringStream($processedHtml));
-        }
+		if ($this->responseIsAlterable($response) && $GLOBALS['TSFE']->config['config']['replacer.'] ?? false) {
+			$processedHtml = $this->regExRepService->process((string) $response->getBody());
+			$response = $response->withBody($this->getStringStream($processedHtml));
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 }

Classes/Service/RegExRepService.php

Indentation +42 added lines, -42 removed lines

@@ -16,46 +16,46 @@
  */
 class RegExRepService implements SingletonInterface
 {
-    public function process(string $html): string
-    {
-        $config = $GLOBALS['TSFE']->config['config']['replacer.'];
-
-        foreach (['search.', 'replace.'] as $section) {
-            if (!isset($config[$section]) || !\is_array($config[$section])) {
-                throw new \Exception('missing entry @ config.replacer.' . $section);
-            }
-
-            if (preg_match_all('/"([\w\-]+)\.";/', serialize(array_keys($config[$section])), $matches)) {
-                $cObj ??= $GLOBALS['TSFE']->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
-
-                foreach ($matches[1] as $key) {
-                    $config[$section][$key] = $cObj
-                        ->stdWrap(
-                            $config[$section][$key],
-                            $config[$section][$key . '.']
-                        )
-                    ;
-                    unset($config[$section][$key . '.']); // keep!
-                }
-            }
-
-            ksort($config[$section], \SORT_NATURAL); // safety
-        }
-
-        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}");
-                }
-            }
-        }
-
-        $arrIntersectKeysCnt = 2 * \count(array_intersect_key($config['search.'], $config['replace.']));
-
-        if ((bool) (\count($config['search.']) + \count($config['replace.']) - $arrIntersectKeysCnt)) {
-            throw new \Exception('config.replacer requests have diverged');
-        }
-
-        return preg_replace($config['search.'], $config['replace.'], $html);
-    }
+	public function process(string $html): string
+	{
+		$config = $GLOBALS['TSFE']->config['config']['replacer.'];
+
+		foreach (['search.', 'replace.'] as $section) {
+			if (!isset($config[$section]) || !\is_array($config[$section])) {
+				throw new \Exception('missing entry @ config.replacer.' . $section);
+			}
+
+			if (preg_match_all('/"([\w\-]+)\.";/', serialize(array_keys($config[$section])), $matches)) {
+				$cObj ??= $GLOBALS['TSFE']->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
+
+				foreach ($matches[1] as $key) {
+					$config[$section][$key] = $cObj
+						->stdWrap(
+							$config[$section][$key],
+							$config[$section][$key . '.']
+						)
+					;
+					unset($config[$section][$key . '.']); // keep!
+				}
+			}
+
+			ksort($config[$section], \SORT_NATURAL); // safety
+		}
+
+		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}");
+				}
+			}
+		}
+
+		$arrIntersectKeysCnt = 2 * \count(array_intersect_key($config['search.'], $config['replace.']));
+
+		if ((bool) (\count($config['search.']) + \count($config['replace.']) - $arrIntersectKeysCnt)) {
+			throw new \Exception('config.replacer requests have diverged');
+		}
+
+		return preg_replace($config['search.'], $config['replace.'], $html);
+	}
 }

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}");
                 }
             }
         }