IControl::setValue() ⇒ setCurrentValues() and Container::setValues() ⇒ setCurrentValues() [Closes #114]

Author: dg

examples/custom-control.php

@@ -31,7 +31,7 @@ public function __construct($label = NULL)
 	}
 
 
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		if ($value === NULL) {
 			$this->day = $this->month = $this->year = '';

src/Forms/Container.php

@@ -42,7 +42,7 @@ public function setDefaults($values, $erase = FALSE)
 	{
 		$form = $this->getForm(FALSE);
 		if (!$form || !$form->isAnchored() || !$form->isSubmitted()) {
-			$this->setValues($values, $erase);
+			$this->setCurrentValues($values, $erase);
 		}
 		return $this;
 	}
@@ -54,7 +54,7 @@ public function setDefaults($values, $erase = FALSE)
 	 * @param  bool     erase other controls?
 	 * @return self
 	 */
-	public function setValues($values, $erase = FALSE)
+	public function setCurrentValues($values, $erase = FALSE)
 	{
 		if ($values instanceof \Traversable) {
 			$values = iterator_to_array($values);
@@ -66,25 +66,35 @@ public function setValues($values, $erase = FALSE)
 		foreach ($this->getComponents() as $name => $control) {
 			if ($control instanceof IControl) {
 				if (array_key_exists($name, $values)) {
-					$control->setValue($values[$name]);
+					$control->setCurrentValue($values[$name]);
 
 				} elseif ($erase) {
-					$control->setValue(NULL);
+					$control->setCurrentValue(NULL);
 				}
 
 			} elseif ($control instanceof self) {
 				if (array_key_exists($name, $values)) {
-					$control->setValues($values[$name], $erase);
+					$control->setCurrentValues($values[$name], $erase);
 
 				} elseif ($erase) {
-					$control->setValues([], $erase);
+					$control->setCurrentValues([], $erase);
 				}
 			}
 		}
 		return $this;
 	}
 
 
+	/**
+	 * @deprecated
+	 */
+	public function setValues($values, $erase = FALSE)
+	{
+		trigger_error(__METHOD__ . '() is deprecated; use setCurrentValues() instead.', E_USER_DEPRECATED);
+		return $this->setCurrentValues($values, $erase);
+	}
+
+
 	/**
 	 * Returns the values submitted by the form.
 	 * @param  bool  return values as an array?

src/Forms/Controls/BaseControl.php

@@ -86,7 +86,7 @@ public function __construct($caption = NULL)
 		if (self::$autoOptional) {
 			$this->setRequired(FALSE);
 		}
-		$this->setValue(NULL);
+		$this->setCurrentValue(NULL);
 	}
 
 
@@ -120,7 +120,7 @@ public function getForm($need = TRUE)
 	 */
 	public function loadHttpData()
 	{
-		$this->setValue($this->getHttpData(Form::DATA_TEXT));
+		$this->setCurrentValue($this->getHttpData(Form::DATA_TEXT));
 	}
 
 
@@ -151,10 +151,18 @@ public function getHtmlName()
 	 * Sets control's value.
 	 * @return self
 	 */
+	public function setCurrentValue($value)
+	{
+		return $this->setValue($value);
+	}
+
+
+	/**
+	 * @deprecated
+	 */
 	public function setValue($value)
 	{
 		$this->value = $value;
-		return $this;
 	}
 
 
@@ -187,7 +195,7 @@ public function setDefaultValue($value)
 	{
 		$form = $this->getForm(FALSE);
 		if ($this->isDisabled() || !$form || !$form->isAnchored() || !$form->isSubmitted()) {
-			$this->setValue($value);
+			$this->setCurrentValue($value);
 		}
 		return $this;
 	}
@@ -201,7 +209,7 @@ public function setDefaultValue($value)
 	public function setDisabled($value = TRUE)
 	{
 		if ($this->disabled = (bool) $value) {
-			$this->setValue(NULL);
+			$this->setCurrentValue(NULL);
 		}
 		return $this;
 	}

src/Forms/Controls/Checkbox.php

@@ -36,7 +36,7 @@ public function __construct($label = NULL)
 	 * @param  bool
 	 * @return self
 	 */
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		if (!is_scalar($value) && $value !== NULL) {
 			throw new Nette\InvalidArgumentException(sprintf("Value must be scalar or NULL, %s given in field '%s'.", gettype($value), $this->name));

src/Forms/Controls/ChoiceControl.php

@@ -56,7 +56,7 @@ public function loadHttpData()
 	 * @param  string|int
 	 * @return self
 	 */
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		if ($this->checkAllowedValues && $value !== NULL && !array_key_exists((string) $value, $this->items)) {
 			$set = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');

src/Forms/Controls/CsrfProtection.php

@@ -47,7 +47,7 @@ protected function attached($parent)
 	/**
 	 * @return self
 	 */
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		return $this;
 	}

src/Forms/Controls/HiddenField.php

@@ -37,7 +37,7 @@ public function __construct($persistentValue = NULL)
 	 * @param  string
 	 * @return self
 	 */
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		if (!is_scalar($value) && $value !== NULL && !method_exists($value, '__toString')) {
 			throw new Nette\InvalidArgumentException(sprintf("Value must be scalar or NULL, %s given in field '%s'.", gettype($value), $this->name));

src/Forms/Controls/MultiChoiceControl.php

@@ -52,7 +52,7 @@ public function loadHttpData()
 	 * @param  array
 	 * @return self
 	 */
-	public function setValue($values)
+	public function setCurrentValue($values)
 	{
 		if (is_scalar($values) || $values === NULL) {
 			$values = (array) $values;

src/Forms/Controls/TextBase.php

@@ -29,7 +29,7 @@ abstract class TextBase extends BaseControl
 	 * @param  string
 	 * @return self
 	 */
-	public function setValue($value)
+	public function setCurrentValue($value)
 	{
 		if ($value === NULL) {
 			$value = '';

src/Forms/Controls/TextInput.php

@@ -35,7 +35,7 @@ public function __construct($label = NULL, $maxLength = NULL)
 	 */
 	public function loadHttpData()
 	{
-		$this->setValue($this->getHttpData(Form::DATA_LINE));
+		$this->setCurrentValue($this->getHttpData(Form::DATA_LINE));
 	}