DateTimeControl: fixed loading empty string [Closes #311]

nette · Oct 31, 2023 · cb0773b · cb0773b
1 parent 94bad1c
commit cb0773b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Forms/Controls/DateTimeControl.php b/src/Forms/Controls/DateTimeControl.php
@@ -121,7 +121,7 @@ public function loadHttpData(): void
 	{
 		$value = $this->getHttpData(Nette\Forms\Form::DataText);
 		try {
-			$this->value = is_string($value) && preg_match('~^(\d{4}-\d{2}-\d{2})?T?(\d{2}:\d{2}(:\d{2}(\.\d+)?)?)?$~', $value)
+			$this->value = is_string($value) && preg_match('~^[\dT.:-]+$~', $value)
 				? $this->normalizeValue($value)
 				: null;
 		} catch (\Throwable $e) {

diff --git a/tests/Forms/Controls.DateTimeControl.loadData.phpt b/tests/Forms/Controls.DateTimeControl.loadData.phpt
@@ -65,6 +65,33 @@ test('invalid time', function () {
 });
 
 
+test('empty date', function () {
+	$_POST = ['date' => ''];
+	$form = new Form;
+	$input = $form->addDate('date');
+	Assert::null($input->getValue());
+	Assert::false($input->isFilled());
+});
+
+
+test('empty time', function () {
+	$_POST = ['time' => ''];
+	$form = new Form;
+	$input = $form->addTime('time');
+	Assert::null($input->getValue());
+	Assert::false($input->isFilled());
+});
+
+
+test('empty date-time', function () {
+	$_POST = ['date' => ''];
+	$form = new Form;
+	$input = $form->addDateTime('date');
+	Assert::null($input->getValue());
+	Assert::false($input->isFilled());
+});
+
+
 test('valid date', function () {
 	$_POST = ['date' => '2023-10-22'];
 	$form = new Form;