From a80710657ee28d793399174f229e05edc1f6d0a0 Mon Sep 17 00:00:00 2001
From: Achim Fritz <achim.fritz@b13.com>
Date: Fri, 24 May 2024 14:06:34 +0200
Subject: [PATCH] [BUGFIX] SVG Rendering

---
 Build/phpstan11.neon                          |  2 +
 Classes/AssetCollector.php                    | 25 +++++++++++--
 .../Frontend/Fixtures/SvgViewHelper.csv       | 11 ++++++
 .../Fixtures/Templates/SvgViewHelper.html     |  9 +++++
 .../Functional/Frontend/SvgViewHelperTest.php | 37 +++++++++++++++++++
 5 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 Tests/Functional/Frontend/Fixtures/SvgViewHelper.csv
 create mode 100644 Tests/Functional/Frontend/Fixtures/Templates/SvgViewHelper.html
 create mode 100644 Tests/Functional/Frontend/SvgViewHelperTest.php

diff --git a/Build/phpstan11.neon b/Build/phpstan11.neon
index 649a756..c77cdb9 100644
--- a/Build/phpstan11.neon
+++ b/Build/phpstan11.neon
@@ -6,3 +6,5 @@ parameters:
     - %currentWorkingDirectory%/Classes
   excludePaths:
       - %currentWorkingDirectory%/Classes/Listener/AfterCacheableContentIsGenerated.php
+  ignoreErrors:
+    - '#.*unknown class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScript.#'
diff --git a/Classes/AssetCollector.php b/Classes/AssetCollector.php
index 880d9df..6887443 100644
--- a/Classes/AssetCollector.php
+++ b/Classes/AssetCollector.php
@@ -13,8 +13,10 @@
  */
 
 use B13\Assetcollector\Resource\ResourceCompressor;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -218,6 +220,7 @@ public function buildInlineXmlTag(): string
                               . '</symbol>';
             }
         }
+
         if (trim($inlineXml) !== '') {
             return '<svg class="tx_assetcollector" aria-hidden="true" style="display: none;" version="1.1" xmlns="http://www.w3.org/2000/svg" '
                    . 'xmlns:xlink="http://www.w3.org/1999/xlink">'
@@ -255,12 +258,28 @@ public function getTypoScriptValue(string $name): string
     protected function loadTypoScript(): void
     {
         $this->typoScriptConfiguration = [];
-        $frontendController = $this->getTypoScriptFrontendController();
-        if ($frontendController !== null) {
-            $this->typoScriptConfiguration = $frontendController->tmpl->setup['plugin.']['tx_assetcollector.']['icons.'] ?? [];
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 12) {
+            $frontendController = $this->getTypoScriptFrontendController();
+            if ($frontendController !== null) {
+                $this->typoScriptConfiguration = $frontendController->tmpl->setup['plugin.']['tx_assetcollector.']['icons.'] ?? [];
+            }
+        } else {
+            $request = $this->getServerRequest();
+            if ($request === null) {
+                return;
+            }
+            /** @var FrontendTypoScript $typoScript */
+            $typoScript = $request->getAttribute('frontend.typoscript');
+            $setup = $typoScript->getSetupArray();
+            $this->typoScriptConfiguration = $setup['plugin.']['tx_assetcollector.']['icons.'] ?? [];
         }
     }
 
+    protected function getServerRequest(): ?ServerRequestInterface
+    {
+        return $GLOBALS['TYPO3_REQUEST'] ?? null;
+    }
+
     protected function getTypoScriptFrontendController(): ?TypoScriptFrontendController
     {
         if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController) {
diff --git a/Tests/Functional/Frontend/Fixtures/SvgViewHelper.csv b/Tests/Functional/Frontend/Fixtures/SvgViewHelper.csv
new file mode 100644
index 0000000..a336015
--- /dev/null
+++ b/Tests/Functional/Frontend/Fixtures/SvgViewHelper.csv
@@ -0,0 +1,11 @@
+"pages"
+,"uid","pid","title","slug"
+,1,0,"root","/"
+"sys_template"
+,"uid","pid","root","config"
+,1,1,1,"page = PAGE
+page.10 = FLUIDTEMPLATE
+page.10.templateRootPaths.10 = EXT:assetcollector/Tests/Functional/Frontend/Fixtures/Templates
+page.10.templateName = SvgViewHelper.html
+plugin.tx_assetcollector.icons.download = EXT:assetcollector/Resources/Public/Icons/Extension.svg
+"
diff --git a/Tests/Functional/Frontend/Fixtures/Templates/SvgViewHelper.html b/Tests/Functional/Frontend/Fixtures/Templates/SvgViewHelper.html
new file mode 100644
index 0000000..4a0acb0
--- /dev/null
+++ b/Tests/Functional/Frontend/Fixtures/Templates/SvgViewHelper.html
@@ -0,0 +1,9 @@
+<html
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    xmlns:ac="http://typo3.org/ns/B13/Assetcollector/ViewHelpers"
+    data-namespace-typo3-fluid="true"
+>
+<f:spaceless>
+	<ac:svg name="download" />
+</f:spaceless>
+</html>
diff --git a/Tests/Functional/Frontend/SvgViewHelperTest.php b/Tests/Functional/Frontend/SvgViewHelperTest.php
new file mode 100644
index 0000000..4bd242b
--- /dev/null
+++ b/Tests/Functional/Frontend/SvgViewHelperTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace B13\Assetcollector\Tests\Functional\Functional;
+
+/*
+ * This file is part of TYPO3 CMS-based extension "assetcollector" by b13.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ */
+
+use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+class SvgViewHelperTest extends FunctionalTestCase
+{
+    protected array $testExtensionsToLoad = ['typo3conf/ext/assetcollector'];
+    protected array $coreExtensionsToLoad = ['core', 'frontend'];
+    protected array $pathsToLinkInTestInstance = ['typo3conf/ext/assetcollector/Build/sites' => 'typo3conf/sites'];
+
+    /**
+     * @test
+     */
+    public function scriptTagForInlineCssIsRendered(): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/SvgViewHelper.csv');
+        $response = $this->executeFrontendSubRequest(new InternalRequest('http://localhost/'));
+        $expected = '<svg><use xlink:href="#icon-Extension"></use></svg>';
+        $body = (string)$response->getBody();
+        self::assertStringContainsString($expected, $body);
+        $expected = '<svg class="tx_assetcollector"';
+        self::assertStringContainsString($expected, $body);
+        $expected = '<rect y="0.3" class="st0" width="256" height="256"></rect>';
+        self::assertStringContainsString($expected, $body);
+    }
+}