diff --git a/src/Form/Form.php b/src/Form/Form.php index 240e197..c944e45 100644 --- a/src/Form/Form.php +++ b/src/Form/Form.php @@ -38,10 +38,6 @@ public function validate(array $values): void $validator = new Validator; $validator->validate($values, $this->toJsonSchema(), Constraint::CHECK_MODE_TYPE_CAST); if (!$validator->isValid()) { - $errorMessages = array_map( - fn ($error) => "[{$error['property']}] {$error['message']}", - $validator->getErrors(), - ); throw new FormValidationException("Form validation failed", $validator->getErrors()); } } diff --git a/src/Form/FormElementCollection.php b/src/Form/FormElementCollection.php index 15ade56..9cfa5a6 100644 --- a/src/Form/FormElementCollection.php +++ b/src/Form/FormElementCollection.php @@ -46,13 +46,11 @@ public function getRequired(): array public function getValues(): array { return array_filter( - Arr::collapse( - Arr::map( - (array) $this, - static fn (FormElement $formElement) => [ - $formElement->name => $formElement->value(), - ], - ), + Arr::mapWithKeys( + (array) $this, + static fn (FormElement $formElement) => [ + $formElement->name => $formElement->value(), + ], ), ); } diff --git a/tests/Form/FormTest.php b/tests/Form/FormTest.php index 0a68712..44b58d9 100644 --- a/tests/Form/FormTest.php +++ b/tests/Form/FormTest.php @@ -204,12 +204,12 @@ public function test_it_converts_to_json_schema(): void public function test_it_gets_values(): void { $text = new Text( - name: 'name_1', + name: '1001', label: 'Label 1', value: 'Initial text', ); $checkbox = new Checkbox( - name: 'name_2', + name: '1002', label: 'Label 2', value: true, ); @@ -238,11 +238,11 @@ public function test_it_gets_values(): void ); assertEquals([ - 'name_1' => 'Initial text', - 'name_2' => true, + 1001 => 'Initial text', + 1002 => true, 'name_4' => [ - 'name_1' => 'Initial text', - 'name_2' => true, + 1001 => 'Initial text', + 1002 => true, ], ], $form->getValues()); }