Merge pull request #3 from pluswerk/bugfix/preserve-correct-comments

Preserve correct TYPO3 comment and don't throw errors if no comment i…
pluswerk · Oct 23, 2019 · e2c1a5f · e2c1a5f
2 parents 158a042 + 5670f15
commit e2c1a5f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/Classes/Service/HtmlMinifier.php b/Classes/Service/HtmlMinifier.php
@@ -71,11 +71,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
             // Not nice but this is really hardcoded in the core.
             if ($this->isFeatureActive('remove_comments')) {
-                $typo3CommentStart = strpos($html, '<!--');
-                $typo3CommentStop = strpos($html, '-->', $typo3CommentStart);
-                $typo3Comment = substr($html, $typo3CommentStart, $typo3CommentStop - $typo3CommentStart + 3);
-                $output = [];
+
+                $typo3Comment = $this->preserveTypo3Comment($html);
+
                 $html = $htmlMin->minify($html);
+                $output = [];
                 $languageMeta = preg_match_all('/<meta charset=[a-zA-Z0-9-_"]*>/', $html, $output);
                 if ($languageMeta) {
                     $insertAt = strpos($html, $output[0][0]) + strlen($output[0][0]);
@@ -103,4 +103,22 @@ protected function isFeatureActive(string $feature): bool
     {
         return isset($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['minify'][$feature]) && $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['minify'][$feature] === '1';
     }
+
+    private function preserveTypo3Comment(string $html): string
+    {
+        $typo3CommentStart = strpos($html, '<!--');
+        if ($typo3CommentStart !== false) {
+            $typo3CommentStop = strpos($html, '-->', $typo3CommentStart);
+            $typo3Comment = substr($html, $typo3CommentStart, $typo3CommentStop - $typo3CommentStart + 3);
+
+            if (strpos($typo3Comment, 'TYPO3') !== false) {
+                return $typo3Comment;
+            }
+
+            $html = str_replace($typo3Comment, '', $html);
+            return $this->preserveTypo3Comment($html);
+        }
+
+        return '';
+    }
 }
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,7 +12,7 @@
     'uploadfolder' => '0',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '1.0.4',
+    'version' => '1.0.5',
     'constraints' =>[
         'depends' => [
             'typo3' => '9.5.0-9.99.99',