Take value as label by default

octobercms · Oct 8, 2024 · 38750a9 · 38750a9
1 parent 9d82cb1
commit 38750a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/src/Element/Filter/ScopeDefinition.php b/src/Element/Filter/ScopeDefinition.php
@@ -117,11 +117,7 @@ public function asOptionsDefinition($options = null)
         $result = [];
 
         foreach ($options as $value => $option) {
-            $definition = (new OptionDefinition)
-                ->value($value)
-                ->useOptionConfig($option);
-
-            $result[$value] = $definition;
+            $result[$value] = (new OptionDefinition)->useOptionConfig($value, $option);
         }
 
         return $result;

diff --git a/src/Element/Form/FieldDefinition.php b/src/Element/Form/FieldDefinition.php
@@ -157,11 +157,7 @@ public function asOptionsDefinition($options = null)
         $result = [];
 
         foreach ($options as $value => $option) {
-            $definition = (new OptionDefinition)
-                ->value($value)
-                ->useOptionConfig($option);
-
-            $result[$value] = $definition;
+            $result[$value] = (new OptionDefinition)->useOptionConfig($value, $option);
         }
 
         return $result;

diff --git a/src/Element/OptionDefinition.php b/src/Element/OptionDefinition.php
@@ -40,8 +40,10 @@ protected function initDefaultValues()
     /**
      * useOptionConfig
      */
-    public function useOptionConfig($option): OptionDefinition
+    public function useOptionConfig($value, $option = null): OptionDefinition
     {
+        $this->value($value)->label($value);
+
         if (!is_array($option)) {
             $this->label($option);
             return $this;
@@ -83,9 +85,7 @@ protected function evalChildOptions(array $children): array
         $result = [];
 
         foreach ($children as $value => $option) {
-            $result[$value] = (new OptionDefinition)
-                ->value($value)
-                ->useOptionConfig($option);
+            $result[$value] = (new OptionDefinition)->useOptionConfig($value, $option);
         }
 
         return $result;