TextBase: emptyValue is removed from value in validate()

Author: dg

src/Forms/Controls/TextBase.php

@@ -48,7 +48,7 @@ public function setValue($value)
 	 */
 	public function getValue()
 	{
-		return $this->value === Strings::trim($this->translate($this->emptyValue)) ? '' : $this->value;
+		return $this->value;
 	}
 
 
@@ -133,4 +133,17 @@ public function addRule($validator, $message = NULL, $arg = NULL)
 		return parent::addRule($validator, $message, $arg);
 	}
 
+
+	/**
+	 * Performs the server side validation.
+	 * @return void
+	 */
+	public function validate()
+	{
+		if ($this->value === Strings::trim($this->translate($this->emptyValue))) {
+			$this->value = '';
+		}
+		parent::validate();
+	}
+
 }

tests/Forms/Controls.TextBase.loadData.phpt

@@ -45,6 +45,7 @@ test(function () { // empty value
 	$input = $form->addText('url')
 		->setEmptyValue('nette.org');
 
+	$input->validate();
 	Assert::same('', $input->getValue());
 });
 
@@ -56,6 +57,7 @@ test(function () { // empty value
 	$input = $form->addText('phone')
 		->setEmptyValue('+420 ');
 
+	$input->validate();
 	Assert::same('', $input->getValue());
 });