[BUGFIX] Fix issues around icon processing

* Preserves icon identifiers as value of "icon" option * Returns already registered icon identifiers directly * Registers icons with Icon::SIZE_DEFAULT Close: #2032 Close: #2049
FluidTYPO3 · Aug 14, 2023 · 700c9fc · 700c9fc
1 parent cebbe4f
commit 700c9fc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Classes/Builder/ContentTypeBuilder.php b/Classes/Builder/ContentTypeBuilder.php
@@ -242,11 +242,6 @@ protected function addIcon(Form $form, string $contentType): string
             return $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes'][$contentType];
         }
         $icon = MiscellaneousUtility::getIconForTemplate($form);
-        if (!empty($icon)) {
-            if (strpos($icon, 'EXT:') === 0 || $icon[0] !== '/') {
-                $icon = GeneralUtility::getFileAbsFileName($icon);
-            }
-        }
         if (!$icon) {
             $icon = ExtensionManagementUtility::extPath('flux', 'Resources/Public/Icons/Extension.svg');
         }

diff --git a/Classes/Form/Field/ControllerActions.php b/Classes/Form/Field/ControllerActions.php
@@ -378,6 +378,9 @@ protected function buildItemsForActions(array $actions): array
         return $items;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     protected function resolvePathToFileInExtension(string $extensionKey, string $path): string
     {
         return ExtensionManagementUtility::extPath($extensionKey, $path);

diff --git a/Classes/Utility/MiscellaneousUtility.php b/Classes/Utility/MiscellaneousUtility.php
@@ -83,6 +83,16 @@ public static function getIconForTemplate(Form $form): ?string
      */
     public static function createIcon(string $originalFile, ?string $identifier = null): string
     {
+        /** @var IconRegistry $iconRegistry */
+        $iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
+        if ($iconRegistry->isRegistered($originalFile)) {
+            return $originalFile;
+        }
+
+        if (strpos($originalFile, 'EXT:') === 0 || $originalFile[0] !== '/') {
+            $originalFile = GeneralUtility::getFileAbsFileName($originalFile);
+        }
+
         $extension = pathinfo($originalFile, PATHINFO_EXTENSION);
         switch (strtolower($extension)) {
             case 'svg':
@@ -92,13 +102,12 @@ public static function createIcon(string $originalFile, ?string $identifier = nu
             default:
                 $iconProvider = BitmapIconProvider::class;
         }
+
         $iconIdentifier = $identifier ?? 'icon-' . md5($originalFile);
-        /** @var IconRegistry $iconRegistry */
-        $iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
         $iconRegistry->registerIcon(
             $iconIdentifier,
             $iconProvider,
-            ['source' => $originalFile, 'size' => Icon::SIZE_LARGE]
+            ['source' => $originalFile, 'size' => Icon::SIZE_DEFAULT]
         );
         return $iconIdentifier;
     }

diff --git a/Tests/Unit/Utility/MiscellaneousUtilityTest.php b/Tests/Unit/Utility/MiscellaneousUtilityTest.php
@@ -128,7 +128,7 @@ public function testCreateIcon()
         $graphicsClassName = 'TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][$graphicsClassName]['className'] =
             'FluidTYPO3\\Flux\\Tests\\Fixtures\\Classes\\DummyGraphicalFunctions';
-        $this->assertEquals('icon-b7c9dc75b2c29a9a52e8c1f7a996348b', MiscellaneousUtility::createIcon('foobar-icon'));
+        $this->assertEquals('foobar-icon', MiscellaneousUtility::createIcon('foobar-icon'));
     }
 
     /**
@@ -139,7 +139,7 @@ public function testCreateIconWithCustomIdentifier()
         $graphicsClassName = 'TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][$graphicsClassName]['className'] =
             'FluidTYPO3\\Flux\\Tests\\Fixtures\\Classes\\DummyGraphicalFunctions';
-        $this->assertEquals('icon-identifier', MiscellaneousUtility::createIcon('foobar-icon', 'icon-identifier'));
+        $this->assertEquals('foobar-icon', MiscellaneousUtility::createIcon('foobar-icon', 'icon-identifier'));
     }
 
     /**