revert force

Author: GrabowskiM

src/lib/Twig/Components/Checkbox/ListField.php

@@ -26,8 +26,14 @@ final class ListField extends AbstractField
 {
     use ListFieldTrait;
 
+    /** @var array<string|int> */
     public array $value = [];
 
+    /**
+     * @param CheckboxItem $item
+     *
+     * @return CheckboxItem
+     */
     protected function modifyListItem(array $item): array
     {
         $item['checked'] = in_array($item['value'], $this->value, true);

src/lib/Twig/Components/InputText/Field.php

@@ -29,6 +29,8 @@ final class Field extends AbstractField
 
     public string $type = 'input-text';
 
+    public string $value = '';
+
     /**
      * @return AttrMap
      */
@@ -63,5 +65,7 @@ protected function configurePropsResolver(OptionsResolver $resolver): void
         });
         $resolver->setRequired(['name']);
         $resolver->setAllowedTypes('id', ['null', 'string']);
+        $resolver->setDefaults(['value' => '']);
+        $resolver->setAllowedTypes('value', 'string');
     }
 }

src/lib/Twig/Components/ListFieldTrait.php

@@ -16,25 +16,36 @@
  *     value: string|int,
  *     label: string,
  * }
+ * @phpstan-type ListItems list<ListItem>
  */
 trait ListFieldTrait
 {
+    public const string VERTICAL = 'vertical';
+    public const string HORIZONTAL = 'horizontal';
+
     public string $direction = 'vertical';
 
-    /** @var ListItem[] */
+    /** @var ListItems */
     #[ExposeInTemplate(name: 'items', getter: 'getItems')]
     public array $items = [];
 
-    /** @return ListItem[] */
+    /**
+     * @return ListItems
+     */
     public function getItems(): array
     {
-        return array_map(function ($item) {
+        return array_map(function (array $item) {
             $listItem = $item + ['name' => $this->name, 'required' => $this->required];
 
             return $this->modifyListItem($listItem);
         }, $this->items);
     }
 
+    /**
+     * @param ListItem $item
+     *
+     * @return ListItem
+     */
     protected function modifyListItem(array $item): array
     {
         return $item;
@@ -49,7 +60,7 @@ protected function validateListFieldProps(OptionsResolver $resolver): void
 
         $resolver
             ->define('direction')
-            ->allowedValues('vertical', 'horizontal')
-            ->default('vertical');
+            ->allowedValues(self::VERTICAL, self::HORIZONTAL)
+            ->default(self::VERTICAL);
     }
 }

tests/integration/Twig/Components/InputText/FieldTest.php

@@ -27,7 +27,6 @@ public function testMount(): void
             [
                 'name' => 'title',
                 'id' => 'title',
-                'value' => 'Hello',
                 'required' => true,
                 'labelExtra' => ['class' => 'u-mb-1'],
                 'helperTextExtra' => ['data-test' => 'help'],
@@ -39,7 +38,6 @@ public function testMount(): void
 
         self::assertSame('title', $component->name, 'Prop "name" should be set on the component.');
         self::assertSame('title', $component->id, 'Prop "id" should be set on the component.');
-        self::assertSame('Hello', $component->value, 'Prop "value" should be set on the component.');
         self::assertTrue($component->required, 'Prop "required" should be true.');
 
         /** @var array<string, mixed> $label */
@@ -53,7 +51,6 @@ public function testMount(): void
         self::assertSame('title', $input['id'] ?? null, 'Input "id" should be set from prop.');
         self::assertSame('title', $input['name'] ?? null, 'Input "name" should be set from prop.');
         self::assertTrue((bool)($input['required'] ?? false), 'Input should have required attribute.');
-        self::assertSame('Hello', $input['value'] ?? null, 'Input "value" should pass through.');
         self::assertSame('true', $input['data-ids-custom-init'] ?? null, 'Input should include data-ids-custom-init="true".');
         self::assertSame('ids-input u-w-full', $input['class'] ?? null, 'Input class should be merged.');
         self::assertSame('Type…', $input['placeholder'] ?? null, 'Input placeholder should be merged.');

tests/integration/Twig/Components/RadioButton/FieldTest.php

@@ -38,7 +38,6 @@ public function testDefaultRenderProducesWrapperAndRadioInput(): void
 
         $wrapper = $this->getWrapper($crawler);
         $class = $this->getClassAttr($wrapper);
-        self::assertSame('foo', $wrapper->attr('value'), 'Wrapper "value" should be passed through.');
         self::assertStringContainsString('ids-radio-button-field', $class, 'Wrapper should have "ids-radio-button-field" class.');
         self::assertStringContainsString('My label', $this->getText($wrapper), 'Wrapper should render provided label content.');