Remove help field logic and enhance unit display in DurationType forms

Author: chapterjason

src/Form/DurationType.php

@@ -166,36 +166,6 @@ public function configureOptions(OptionsResolver $resolver): void
 
             return $data;
         });
-
-        $resolver->setNormalizer('help', function (Options $options, $value) {
-            if (null === $value) {
-                $dotFields = ['year', 'month', 'day'];
-                $colonFields = ['hour', 'minute', 'second'];
-
-                $dotFields = array_values(array_filter($dotFields, static fn ($field) => isset($options[$field]) && $options[$field]));
-                $colonFields = array_values(array_filter($colonFields, static fn ($field) => isset($options[$field]) && $options[$field]));
-
-                $value = '';
-
-                for ($index = 0, $lastIndex = \count($dotFields); $index < $lastIndex; ++$index) {
-                    if ($index === $lastIndex - 1 && 0 === \count($colonFields)) {
-                        $value .= \sprintf('%ss', $dotFields[$index]);
-                    } else {
-                        $value .= \sprintf('%ss.', $dotFields[$index]);
-                    }
-                }
-
-                for ($index = 0, $lastIndex = \count($colonFields); $index < $lastIndex; ++$index) {
-                    if ($index === $lastIndex - 1) {
-                        $value .= \sprintf('%ss', $colonFields[$index]);
-                    } else {
-                        $value .= \sprintf('%ss:', $colonFields[$index]);
-                    }
-                }
-            }
-
-            return $value;
-        });
     }
 
     public function getBlockPrefix(): string

templates/form/bootstrap_5_form_layout.html.twig

@@ -15,6 +15,7 @@
         <div class="input-group">
             {% if units.year %}
                 {{ form_widget(form.year) }}
+                <span class="input-group-text">{{ 'years' }}</span>
             {% endif %}
 
             {% if units.month %}
@@ -23,6 +24,7 @@
                 {% endif %}
 
                 {{ form_widget(form.month) }}
+                <span class="input-group-text">{{ 'months' }}</span>
             {% endif %}
 
             {% if units.day %}
@@ -31,6 +33,7 @@
                 {% endif %}
 
                 {{ form_widget(form.day) }}
+                <span class="input-group-text">{{ 'days' }}</span>
             {% endif %}
 
             {% if units.hour %}
@@ -39,6 +42,7 @@
                 {% endif %}
 
                 {{ form_widget(form.hour) }}
+                <span class="input-group-text">{{ 'hours' }}</span>
             {% endif %}
 
             {% if units.minute %}
@@ -47,6 +51,7 @@
                 {% endif %}
 
                 {{ form_widget(form.minute) }}
+                <span class="input-group-text">{{ 'minutes' }}</span>
             {% endif %}
 
             {% if units.second %}
@@ -55,6 +60,7 @@
                 {% endif %}
 
                 {{ form_widget(form.second) }}
+                <span class="input-group-text">{{ 'seconds' }}</span>
             {% endif %}
         </div>
     </div>

templates/form/form_layout.html.twig

@@ -9,6 +9,7 @@
     <div {{ block('widget_container_attributes') }}>
         {% if units.year %}
             {{ form_widget(form.year) }}
+            <span class="input-group-text">{{ 'years' }}</span>
         {% endif %}
 
         {% if units.month %}
@@ -17,6 +18,7 @@
             {% endif %}
 
             {{ form_widget(form.month) }}
+            <span class="input-group-text">{{ 'months' }}</span>
         {% endif %}
 
         {% if units.day %}
@@ -25,6 +27,7 @@
             {% endif %}
 
             {{ form_widget(form.day) }}
+            <span class="input-group-text">{{ 'days' }}</span>
         {% endif %}
 
         {% if units.hour %}
@@ -33,6 +36,7 @@
             {% endif %}
 
             {{ form_widget(form.hour) }}
+            <span class="input-group-text">{{ 'hours' }}</span>
         {% endif %}
 
         {% if units.minute %}
@@ -41,6 +45,7 @@
             {% endif %}
 
             {{ form_widget(form.minute) }}
+            <span class="input-group-text">{{ 'minutes' }}</span>
         {% endif %}
 
         {% if units.second %}
@@ -49,6 +54,7 @@
             {% endif %}
 
             {{ form_widget(form.second) }}
+            <span class="input-group-text">{{ 'seconds' }}</span>
         {% endif %}
     </div>
 {%- endblock -%}

tests/Form/DurationTypeTest.php

@@ -47,7 +47,6 @@ public function testConfigureAnotherUnit(): void
 
         $this->assertTrue($form->isSynchronized());
         $this->assertEquals(new Second("5196852"), $form->getData()->getValue());
-        $this->assertSame("months.hours:minutes:seconds", $view->vars['help']);
     }
 
     public function testSubmitNull(): void
@@ -81,8 +80,6 @@ public function testWithPreData(): void
             'minute' => '12',
             'second' => null,
         ], $view->vars['value']);
-
-        $this->assertSame("hours:minutes", $view->vars['help']);
     }
 
     public function testWithNullPreData(): void
@@ -95,6 +92,5 @@ public function testWithNullPreData(): void
 
         // Assert
         $this->assertNull($view->vars['value']);
-        $this->assertSame("hours:minutes", $view->vars['help']);
     }
 }