Merge pull request #137 from xerc/master

[FIX] missing cObj @ replacer

Author: lochmueller

Classes/Middleware/RegExRepMiddleware.php

@@ -11,7 +11,6 @@
 use TYPO3\CMS\Core\Http\NullResponse;
 use TYPO3\CMS\Core\Http\Stream;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
@@ -28,8 +27,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         if (!($response instanceof NullResponse)
         && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController
-        && $GLOBALS['TSFE']->cObj instanceof ContentObjectRenderer
-        && isset($GLOBALS['TSFE']->config['config']['replacer.'])
+        && ($GLOBALS['TSFE']->config['config']['replacer.'] ?? false)
         && 'text/html' == substr($response->getHeaderLine('Content-Type'), 0, 9)
         && !empty($response->getBody())
         ) {

Classes/Service/RegExRepService.php

@@ -4,6 +4,9 @@
 
 namespace HTML\Sourceopt\Service;
 
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+
 /**
  * Class RegExRepService.
  *
@@ -21,8 +24,10 @@ public function process(string $html): string
             }
 
             if (preg_match_all('/"([\w\-]+)\.";/', serialize(array_keys($config[$section])), $matches)) {
+                $cObj = $cObj ?? $GLOBALS['TSFE']->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
+
                 foreach ($matches[1] as $key) {
-                    $config[$section][$key] = $GLOBALS['TSFE']->cObj
+                    $config[$section][$key] = $cObj
                         ->stdWrap(
                             $config[$section][$key],
                             $config[$section][$key.'.']
@@ -32,8 +37,9 @@ public function process(string $html): string
                 }
             }
 
-            ksort($config[$section], \SORT_NATURAL); // for safety only
+            ksort($config[$section], \SORT_NATURAL); // safety
         }
+        unset($cObj, $matches); // save MEM
 
         if (\TYPO3\CMS\Core\Core\Environment::getContext()->isDevelopment()) {
             foreach ($config['search.'] as $key => $val) {