Skip to content

Commit 8d19bd2

Browse files
dgdg
committed
IControl::setValue() ⇒ setCurrentValues() and Container::setValues() ⇒ setCurrentValues() [Closes #114]
1 parent 312ca1b commit 8d19bd2

40 files changed

+147
-129
lines changed

‎examples/custom-control.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct($label = NULL)
3131
}
3232

3333

34-
public function setValue($value)
34+
public function setCurrentValue($value)
3535
{
3636
if ($value === NULL) {
3737
$this->day = $this->month = $this->year = '';

‎src/Forms/Container.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function setDefaults($values, $erase = FALSE)
4242
{
4343
$form = $this->getForm(FALSE);
4444
if (!$form || !$form->isAnchored() || !$form->isSubmitted()) {
45-
$this->setValues($values, $erase);
45+
$this->setCurrentValues($values, $erase);
4646
}
4747
return $this;
4848
}
@@ -54,7 +54,7 @@ public function setDefaults($values, $erase = FALSE)
5454
* @param bool erase other controls?
5555
* @return self
5656
*/
57-
public function setValues($values, $erase = FALSE)
57+
public function setCurrentValues($values, $erase = FALSE)
5858
{
5959
if ($values instanceof \Traversable) {
6060
$values = iterator_to_array($values);
@@ -66,25 +66,35 @@ public function setValues($values, $erase = FALSE)
6666
foreach ($this->getComponents() as $name => $control) {
6767
if ($control instanceof IControl) {
6868
if (array_key_exists($name, $values)) {
69-
$control->setValue($values[$name]);
69+
$control->setCurrentValue($values[$name]);
7070

7171
} elseif ($erase) {
72-
$control->setValue(NULL);
72+
$control->setCurrentValue(NULL);
7373
}
7474

7575
} elseif ($control instanceof self) {
7676
if (array_key_exists($name, $values)) {
77-
$control->setValues($values[$name], $erase);
77+
$control->setCurrentValues($values[$name], $erase);
7878

7979
} elseif ($erase) {
80-
$control->setValues([], $erase);
80+
$control->setCurrentValues([], $erase);
8181
}
8282
}
8383
}
8484
return $this;
8585
}
8686

8787

88+
/**
89+
* @deprecated
90+
*/
91+
public function setValues($values, $erase = FALSE)
92+
{
93+
trigger_error(__METHOD__ . '() is deprecated; use setCurrentValues() instead.', E_USER_DEPRECATED);
94+
return $this->setCurrentValues($values, $erase);
95+
}
96+
97+
8898
/**
8999
* Returns the values submitted by the form.
90100
* @param bool return values as an array?

‎src/Forms/Controls/BaseControl.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function __construct($caption = NULL)
8686
if (self::$autoOptional) {
8787
$this->setRequired(FALSE);
8888
}
89-
$this->setValue(NULL);
89+
$this->setCurrentValue(NULL);
9090
}
9191

9292

@@ -120,7 +120,7 @@ public function getForm($need = TRUE)
120120
*/
121121
public function loadHttpData()
122122
{
123-
$this->setValue($this->getHttpData(Form::DATA_TEXT));
123+
$this->setCurrentValue($this->getHttpData(Form::DATA_TEXT));
124124
}
125125

126126

@@ -151,10 +151,18 @@ public function getHtmlName()
151151
* Sets control's value.
152152
* @return self
153153
*/
154+
public function setCurrentValue($value)
155+
{
156+
return $this->setValue($value);
157+
}
158+
159+
160+
/**
161+
* @deprecated
162+
*/
154163
public function setValue($value)
155164
{
156165
$this->value = $value;
157-
return $this;
158166
}
159167

160168

@@ -187,7 +195,7 @@ public function setDefaultValue($value)
187195
{
188196
$form = $this->getForm(FALSE);
189197
if ($this->isDisabled() || !$form || !$form->isAnchored() || !$form->isSubmitted()) {
190-
$this->setValue($value);
198+
$this->setCurrentValue($value);
191199
}
192200
return $this;
193201
}
@@ -201,7 +209,7 @@ public function setDefaultValue($value)
201209
public function setDisabled($value = TRUE)
202210
{
203211
if ($this->disabled = (bool) $value) {
204-
$this->setValue(NULL);
212+
$this->setCurrentValue(NULL);
205213
}
206214
return $this;
207215
}

‎src/Forms/Controls/Checkbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct($label = NULL)
3636
* @param bool
3737
* @return self
3838
*/
39-
public function setValue($value)
39+
public function setCurrentValue($value)
4040
{
4141
if (!is_scalar($value) && $value !== NULL) {
4242
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function loadHttpData()
5656
* @param string|int
5757
* @return self
5858
*/
59-
public function setValue($value)
59+
public function setCurrentValue($value)
6060
{
6161
if ($this->checkAllowedValues && $value !== NULL && !array_key_exists((string) $value, $this->items)) {
6262
$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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function attached($parent)
4747
/**
4848
* @return self
4949
*/
50-
public function setValue($value)
50+
public function setCurrentValue($value)
5151
{
5252
return $this;
5353
}

‎src/Forms/Controls/HiddenField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct($persistentValue = NULL)
3737
* @param string
3838
* @return self
3939
*/
40-
public function setValue($value)
40+
public function setCurrentValue($value)
4141
{
4242
if (!is_scalar($value) && $value !== NULL && !method_exists($value, '__toString')) {
4343
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function loadHttpData()
5252
* @param array
5353
* @return self
5454
*/
55-
public function setValue($values)
55+
public function setCurrentValue($values)
5656
{
5757
if (is_scalar($values) || $values === NULL) {
5858
$values = (array) $values;

‎src/Forms/Controls/TextBase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class TextBase extends BaseControl
2929
* @param string
3030
* @return self
3131
*/
32-
public function setValue($value)
32+
public function setCurrentValue($value)
3333
{
3434
if ($value === NULL) {
3535
$value = '';

‎src/Forms/Controls/TextInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct($label = NULL, $maxLength = NULL)
3535
*/
3636
public function loadHttpData()
3737
{
38-
$this->setValue($this->getHttpData(Form::DATA_LINE));
38+
$this->setCurrentValue($this->getHttpData(Form::DATA_LINE));
3939
}
4040

4141

0 commit comments

Comments
 (0)