Use FontAwesomeIcon instead of a string

Author: Cyperghost

com.woltlab.wcf/templates/shared_wysiwygTabMenuFormContainer.tpl

@@ -8,7 +8,7 @@
 				{if $child->isAvailable()}
 					<li data-name="{$child->getName()}"{if !$child->checkDependencies()} hidden{/if}>
 						<button type="button">
-							{if $child->getIcon()}{icon name=$child->getIcon()}{/if}
+							{if $child->getIcon()}{unsafe:$child->getIcon()->toHtml()}{/if}
 							<span>{@$child->getLabel()}</span>
 						</button>
 					</li>

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/IWysiwygTabFormContainer.class.php

@@ -3,6 +3,7 @@
 namespace wcf\system\form\builder\container\wysiwyg;
 
 use wcf\system\form\builder\container\IFormContainer;
+use wcf\system\style\FontAwesomeIcon;
 
 /**
  * Represents a container that is a tab of a wysiwyg tab menu.
@@ -17,7 +18,7 @@ interface IWysiwygTabFormContainer extends IFormContainer
     /**
      * Gets the icon associated with the tab.
      */
-    public function getIcon(): ?string;
+    public function getIcon(): ?FontAwesomeIcon;
 
     /**
      * Gets the name associated with the tab.

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php

@@ -14,6 +14,7 @@
 use wcf\system\form\builder\field\wysiwyg\WysiwygFormField;
 use wcf\system\form\builder\IFormChildNode;
 use wcf\system\form\builder\TWysiwygFormNode;
+use wcf\system\style\FontAwesomeIcon;
 
 /**
  * Represents the whole container with a WYSIWYG editor and the associated tab menu below it with
@@ -505,7 +506,7 @@ public function populate()
                         ->addClass('formAttachmentContent')
                         ->label('wcf.attachment.attachments')
                         ->name("attachments")
-                        ->icon('paperclip')
+                        ->icon(FontAwesomeIcon::fromValues('paperclip'))
                         ->wysiwygId($this->getWysiwygId())
                         ->appendChild(
                             FormContainer::create($this->wysiwygId . 'AttachmentsContainer')
@@ -514,14 +515,14 @@ public function populate()
 
                     WysiwygTabFormContainer::create($this->wysiwygId . 'SettingsTab')
                         ->label('wcf.message.settings')
-                        ->icon('gear')
+                        ->icon(FontAwesomeIcon::fromValues('gear'))
                         ->name('settings')
                         ->wysiwygId($this->getWysiwygId())
                         ->appendChild($this->settingsContainer),
 
                     WysiwygTabFormContainer::create($this->wysiwygId . 'PollTab')
                         ->label('wcf.poll.management')
-                        ->icon('chart-bar')
+                        ->icon(FontAwesomeIcon::fromValues('chart-bar'))
                         ->name('poll')
                         ->wysiwygId($this->getWysiwygId())
                         ->appendChild($this->pollContainer),

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygQuoteFormContainer.class.php

@@ -2,6 +2,8 @@
 
 namespace wcf\system\form\builder\container\wysiwyg;
 
+use wcf\system\style\FontAwesomeIcon;
+
 /**
  * Represents the form container for the quote-related fields below a WYSIWYG editor.
  *
@@ -16,7 +18,7 @@ class WysiwygQuoteFormContainer extends WysiwygTabFormContainer
 
     public function __construct()
     {
-        $this->icon('quote-left')
+        $this->icon(FontAwesomeIcon::fromValues('quote-left'))
             ->name('quotes')
             ->label('wcf.bbcode.quote');
     }

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygSmileyFormContainer.class.php

@@ -8,6 +8,7 @@
 use wcf\system\form\builder\container\TabTabMenuFormContainer;
 use wcf\system\form\builder\TWysiwygFormNode;
 use wcf\system\form\builder\wysiwyg\WysiwygSmileyFormNode;
+use wcf\system\style\FontAwesomeIcon;
 use wcf\util\StringUtil;
 
 /**
@@ -78,9 +79,9 @@ public function populate()
     }
 
     #[\Override]
-    public function getIcon(): string
+    public function getIcon(): ?FontAwesomeIcon
     {
-        return 'face-smile';
+        return FontAwesomeIcon::fromValues('face-smile');
     }
 
     #[\Override]

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygTabFormContainer.class.php

@@ -4,6 +4,7 @@
 
 use wcf\system\form\builder\container\TabFormContainer;
 use wcf\system\form\builder\TWysiwygFormNode;
+use wcf\system\style\FontAwesomeIcon;
 
 /**
  * Represents a container that is a tab of a wysiwyg tab menu.
@@ -22,19 +23,19 @@ class WysiwygTabFormContainer extends TabFormContainer implements IWysiwygTabFor
      */
     protected $templateName = 'shared_wysiwygTabFormContainer';
 
-    protected ?string $icon = null;
+    protected ?FontAwesomeIcon $icon = null;
     protected string $name = '';
 
     #[\Override]
-    public function getIcon(): ?string
+    public function getIcon(): ?FontAwesomeIcon
     {
         return $this->icon;
     }
 
     /**
      * Sets the icon associated with the tab.
      */
-    public function icon(?string $icon): static
+    public function icon(?FontAwesomeIcon $icon): static
     {
         $this->icon = $icon;