Add abstract implementation for select options

Author: BurntimeX

wcfsetup/install/files/lib/system/form/option/CheckboxesFormOption.class.php

@@ -6,8 +6,6 @@
 use wcf\system\form\builder\field\MultipleSelectionFormField;
 use wcf\system\form\option\formatter\IFormOptionFormatter;
 use wcf\system\form\option\formatter\MultipleSelectionFormatter;
-use wcf\system\WCF;
-use wcf\util\JSON;
 
 /**
  * Implementation of a form field for selecting multiple values.
@@ -19,6 +17,8 @@
  */
 class CheckboxesFormOption extends AbstractFormOption
 {
+    use TSelectOptionsFormOption;
+
     #[\Override]
     public function getId(): string
     {
@@ -29,23 +29,7 @@ public function getId(): string
     public function getFormField(string $id, array $configuration = []): AbstractFormField
     {
         $formField = MultipleSelectionFormField::create($id);
-
-        if (isset($configuration['selectOptions'])) {
-            $selectOptions = [];
-            foreach (JSON::decode($configuration['selectOptions']) as $selectOption) {
-                if (isset($selectOption['value'][0])) {
-                    $value = $selectOption['value'][0];
-                } else if (isset($selectOption['value'][WCF::getLanguage()->languageID])) {
-                    $value = $selectOption['value'][WCF::getLanguage()->languageID];
-                } else {
-                    $value = reset($selectOption['value']);
-                }
-
-                $selectOptions[$selectOption['key']] = $value;
-            }
-
-            $formField->options($selectOptions);
-        }
+        $this->setSelectOptions($formField, $configuration);
 
         return $formField;
     }

wcfsetup/install/files/lib/system/form/option/RadioButtonFormOption.class.php

@@ -2,6 +2,9 @@
 
 namespace wcf\system\form\option;
 
+use wcf\system\form\builder\field\AbstractFormField;
+use wcf\system\form\builder\field\RadioButtonFormField;
+
 /**
  * Implementation of a form option for selecting a single value using radio buttons.
  *
@@ -12,9 +15,20 @@
  */
 class RadioButtonFormOption extends SelectFormOption
 {
+    use TSelectOptionsFormOption;
+
     #[\Override]
     public function getId(): string
     {
         return 'radioButton';
     }
+
+    #[\Override]
+    public function getFormField(string $id, array $configuration = []): AbstractFormField
+    {
+        $formField = RadioButtonFormField::create($id);
+        $this->setSelectOptions($formField, $configuration);
+
+        return $formField;
+    }
 }

wcfsetup/install/files/lib/system/form/option/SelectFormOption.class.php

@@ -6,8 +6,6 @@
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\option\formatter\IFormOptionFormatter;
 use wcf\system\form\option\formatter\SelectFormatter;
-use wcf\system\WCF;
-use wcf\util\JSON;
 
 /**
  * Implementation of a form option for selecting a single value.
@@ -19,6 +17,8 @@
  */
 class SelectFormOption extends AbstractFormOption
 {
+    use TSelectOptionsFormOption;
+
     #[\Override]
     public function getId(): string
     {
@@ -29,23 +29,7 @@ public function getId(): string
     public function getFormField(string $id, array $configuration = []): AbstractFormField
     {
         $formField = SelectFormField::create($id);
-
-        if (isset($configuration['selectOptions'])) {
-            $selectOptions = [];
-            foreach (JSON::decode($configuration['selectOptions']) as $selectOption) {
-                if (isset($selectOption['value'][0])) {
-                    $value = $selectOption['value'][0];
-                } else if (isset($selectOption['value'][WCF::getLanguage()->languageID])) {
-                    $value = $selectOption['value'][WCF::getLanguage()->languageID];
-                } else {
-                    $value = reset($selectOption['value']);
-                }
-
-                $selectOptions[$selectOption['key']] = $value;
-            }
-
-            $formField->options($selectOptions);
-        }
+        $this->setSelectOptions($formField, $configuration);
 
         return $formField;
     }

wcfsetup/install/files/lib/system/form/option/TSelectOptionsFormOption.class.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace wcf\system\form\option;
+
+use wcf\system\form\builder\field\ISelectionFormField;
+use wcf\system\WCF;
+use wcf\util\JSON;
+
+/**
+ * Provides helper methods for form options that use select options.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.2
+ */
+trait TSelectOptionsFormOption
+{
+    /**
+     * @param array<string, mixed> $configuration
+     */
+    protected function setSelectOptions(ISelectionFormField $formField, array $configuration): void
+    {
+        if (!isset($configuration['selectOptions'])) {
+            return;
+        }
+
+        $selectOptions = [];
+        foreach (JSON::decode($configuration['selectOptions']) as $selectOption) {
+            if (isset($selectOption['value'][0])) {
+                $value = $selectOption['value'][0];
+            } else if (isset($selectOption['value'][WCF::getLanguage()->languageID])) {
+                $value = $selectOption['value'][WCF::getLanguage()->languageID];
+            } else {
+                $value = reset($selectOption['value']);
+            }
+
+            $selectOptions[$selectOption['key']] = $value;
+        }
+
+        $formField->options($selectOptions);
+    }
+}