lochmueller / sourceopt

Classes/Middleware/RegExRepMiddleware.php

Indentation +23 added lines, -23 removed lines

@@ -19,30 +19,30 @@
  */
 class RegExRepMiddleware implements MiddlewareInterface
 {
-    /**
-     * 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 (!($response instanceof NullResponse)
-        && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
-        && $GLOBALS['TSFE']->cObj instanceof ContentObjectRenderer
-        && \is_array($GLOBALS['TSFE']->config['config']['replacer.']['search.'])
-        && \is_array($GLOBALS['TSFE']->config['config']['replacer.']['replace.'])
-        && 'text/html' == substr($response->getHeaderLine('Content-Type'), 0, 9)
-        && !empty($response->getBody())
-        ) {
-            $processedHtml = GeneralUtility::makeInstance(\HTML\Sourceopt\Service\RegExRepService::class)
-                ->process((string) $response->getBody())
-            ;
+		if (!($response instanceof NullResponse)
+		&& $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
+		&& $GLOBALS['TSFE']->cObj instanceof ContentObjectRenderer
+		&& \is_array($GLOBALS['TSFE']->config['config']['replacer.']['search.'])
+		&& \is_array($GLOBALS['TSFE']->config['config']['replacer.']['replace.'])
+		&& 'text/html' == substr($response->getHeaderLine('Content-Type'), 0, 9)
+		&& !empty($response->getBody())
+		) {
+			$processedHtml = GeneralUtility::makeInstance(\HTML\Sourceopt\Service\RegExRepService::class)
+				->process((string) $response->getBody())
+			;
 
-            $responseBody = new Stream('php://temp', 'rw');
-            $responseBody->write($processedHtml);
-            $response = $response->withBody($responseBody);
-        }
+			$responseBody = new Stream('php://temp', 'rw');
+			$responseBody->write($processedHtml);
+			$response = $response->withBody($responseBody);
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 }

Classes/Middleware/CleanHtmlMiddleware.php

Indentation +25 added lines, -25 removed lines

@@ -18,32 +18,32 @@
  */
 class CleanHtmlMiddleware implements MiddlewareInterface
 {
-    /**
-     * 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 (!($response instanceof NullResponse)
-        && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
-        && ($GLOBALS['TSFE']->config['config']['sourceopt.']['enabled'] ?? false)
-        && 'text/html' == substr($response->getHeaderLine('Content-Type'), 0, 9)
-        && !empty($response->getBody())
-        ) {
-            $processedHtml = GeneralUtility::makeInstance(\HTML\Sourceopt\Service\CleanHtmlService::class)
-                ->clean(
-                    (string) $response->getBody(),
-                    (array) $GLOBALS['TSFE']->config['config']['sourceopt.']
-                )
-            ;
+		if (!($response instanceof NullResponse)
+		&& $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
+		&& ($GLOBALS['TSFE']->config['config']['sourceopt.']['enabled'] ?? false)
+		&& 'text/html' == substr($response->getHeaderLine('Content-Type'), 0, 9)
+		&& !empty($response->getBody())
+		) {
+			$processedHtml = GeneralUtility::makeInstance(\HTML\Sourceopt\Service\CleanHtmlService::class)
+				->clean(
+					(string) $response->getBody(),
+					(array) $GLOBALS['TSFE']->config['config']['sourceopt.']
+				)
+			;
 
-            // Replace old body with $processedHtml
-            $responseBody = new Stream('php://temp', 'rw');
-            $responseBody->write($processedHtml);
-            $response = $response->withBody($responseBody);
-        }
+			// Replace old body with $processedHtml
+			$responseBody = new Stream('php://temp', 'rw');
+			$responseBody->write($processedHtml);
+			$response = $response->withBody($responseBody);
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 }

Classes/Service/RegExRepService.php

Indentation +26 added lines, -26 removed lines

@@ -11,34 +11,34 @@
  */
 class RegExRepService implements \TYPO3\CMS\Core\SingletonInterface
 {
-    public function process(string $html): string
-    {
-        $config = $GLOBALS['TSFE']->config['config']['replacer.'];
+	public function process(string $html): string
+	{
+		$config = $GLOBALS['TSFE']->config['config']['replacer.'];
 
-        foreach ($config as $section => &$block) {
-            foreach ($block as $key => &$regex) {
-                if ('search.' == $section && '.' !== $key[-1] && !preg_match('/^(.).+\1[a-z]*$/i', $regex)) {
-                    throw new \Exception("Please check your RegEx @ {$key} = {$regex}");
-                }
-                if (isset($config[$section][$key.'.'])) {
-                    $regex = $GLOBALS['TSFE']->cObj
-                        ->stdWrap(
-                            $regex,
-                            $config[$section][$key.'.']
-                        )
-                    ;
-                    unset($config[$section][$key.'.']); // keep!
-                }
-            }
-            ksort($config[$section]); // only for safety
-        }
+		foreach ($config as $section => &$block) {
+			foreach ($block as $key => &$regex) {
+				if ('search.' == $section && '.' !== $key[-1] && !preg_match('/^(.).+\1[a-z]*$/i', $regex)) {
+					throw new \Exception("Please check your RegEx @ {$key} = {$regex}");
+				}
+				if (isset($config[$section][$key.'.'])) {
+					$regex = $GLOBALS['TSFE']->cObj
+						->stdWrap(
+							$regex,
+							$config[$section][$key.'.']
+						)
+					;
+					unset($config[$section][$key.'.']); // keep!
+				}
+			}
+			ksort($config[$section]); // only for safety
+		}
 
-        $arrIntersectKeysCnt = 2 * \count(array_intersect_key($config['search.'], $config['replace.']));
+		$arrIntersectKeysCnt = 2 * \count(array_intersect_key($config['search.'], $config['replace.']));
 
-        if ((bool) (\count($config['search.']) + \count($config['replace.']) - $arrIntersectKeysCnt)) {
-            throw new \Exception('search/replace requests have diverged');
-        }
+		if ((bool) (\count($config['search.']) + \count($config['replace.']) - $arrIntersectKeysCnt)) {
+			throw new \Exception('search/replace requests have diverged');
+		}
 
-        return preg_replace($config['search.'], $config['replace.'], $html);
-    }
+		return preg_replace($config['search.'], $config['replace.'], $html);
+	}
 }