Use FontAwesomeIcon to provide an icon for menu items

See WoltLab/docs.woltlab.com#430 (comment)
WoltLab · May 2, 2024 · c2e80cd · c2e80cd
1 parent 0ae6ebc
commit c2e80cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
@@ -7,6 +7,7 @@
 use wcf\system\menu\acp\event\AcpMenuCollecting;
 use wcf\system\menu\ITreeMenuItem;
 use wcf\system\menu\TreeMenu;
+use wcf\system\style\FontAwesomeIcon;
 use wcf\system\WCF;
 
 /**
@@ -77,12 +78,23 @@ private function loadLegacyMenuItems(): void
                     continue;
                 }
 
+                $icon = null;
+                if ($item->icon) {
+                    if (FontAwesomeIcon::isValidString($item->icon)) {
+                        $icon = FontAwesomeIcon::fromString($item->icon);
+                    } elseif (\str_starts_with($item->icon, 'fa-')) {
+                        // Safeguard to prevent legacy icons from breaking
+                        // the admin panel during the upgrade to 6.0.
+                        $icon = FontAwesomeIcon::fromString("question;true");
+                    }
+                }
+
                 $this->menuItems[$parentMenuItem][] = new AcpMenuItem(
                     $item->menuItem,
                     $item->__toString(),
                     $item->parentMenuItem,
                     $item->getLink(),
-                    $item->icon ?? ''
+                    $icon
                 );
             }
         }

diff --git a/wcfsetup/install/files/lib/system/menu/acp/AcpMenuItem.class.php b/wcfsetup/install/files/lib/system/menu/acp/AcpMenuItem.class.php
@@ -21,7 +21,7 @@ public function __construct(
         public readonly string $title = '',
         public readonly string $parentMenuItem = '',
         public readonly string $link = '',
-        public readonly string $icon = ''
+        public readonly ?FontAwesomeIcon $icon = null
     ) {
     }
 
@@ -32,17 +32,7 @@ public function getLink()
 
     public function getIcon(): ?FontAwesomeIcon
     {
-        if ($this->icon) {
-            if (FontAwesomeIcon::isValidString($this->icon)) {
-                return FontAwesomeIcon::fromString($this->icon);
-            } elseif (\str_starts_with($this->icon, 'fa-')) {
-                // Safeguard to prevent legacy icons from breaking
-                // the admin panel during the upgrade to 6.0.
-                return FontAwesomeIcon::fromString("question;true");
-            }
-        }
-
-        return null;
+        return $this->icon;
     }
 
     public function __toString()