Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Components/Inputs/Number.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ class Number extends BaseComponent

protected function processValidations(string $fieldKey, string $fieldLabel, mixed $submissionValue, Factory $validator): MessageBag
{
$fieldKey = $this->label() ?? $this->key();

$rules = new RuleBag($fieldKey, ['numeric']);
$rules->addIf('required', $this->validation('required') === true);

$this->validation('required')
? $rules->add('required')
: $rules->add('nullable');

$rules->addIfNotNull(sprintf('min:%s', $this->validation('min')), $this->validation('min'));
$rules->addIfNotNull(sprintf('max:%s', $this->validation('max')), $this->validation('max'));

$validator = app()->make('validator')->make(
return $validator->make(
[$fieldKey => $submissionValue],
$rules->rules(),
[],
[$fieldKey => $fieldLabel]
);

return $validator->messages();
)->messages();
}

/**
Expand Down
5 changes: 4 additions & 1 deletion tests/Components/Inputs/NumberTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public static function validationsProvider(): array
'min passes' => [['min' => 10], 11, true],
'max fails' => [['max' => 3], 4, false],
'max passes' => [['max' => 3], 3, true],
];
// Regression: optional number field should accept null without error
'optional empty passes' => [[], null, true],
'optional empty string passes' => [[], '', true],
];
}

public static function submissionValueProvider(): array
Expand Down
Loading