Revert: Forms: $cols & $rows do not trigger error

nette · May 11, 2014 · 190c113 · 190c113
1 parent d5914a5
commit 190c113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -231,10 +231,7 @@ public function getForm($need = TRUE)
 	public function addText($name, $label = NULL, $cols = NULL, $maxLength = NULL)
 	{
 		$control = new Controls\TextInput($label, $maxLength);
-		if ($cols) {
-			trigger_error(__METHOD__ . '() third parameter $cols is deprecated, use setAttribute("size", ...).', E_USER_DEPRECATED);
-			$control->setAttribute('size', $cols);
-		}
+		$control->setAttribute('size', $cols);
 		return $this[$name] = $control;
 	}
 
@@ -250,10 +247,7 @@ public function addText($name, $label = NULL, $cols = NULL, $maxLength = NULL)
 	public function addPassword($name, $label = NULL, $cols = NULL, $maxLength = NULL)
 	{
 		$control = new Controls\TextInput($label, $maxLength);
-		if ($cols) {
-			trigger_error(__METHOD__ . '() third parameter $cols is deprecated, use setAttribute("size", ...).', E_USER_DEPRECATED);
-			$control->setAttribute('size', $cols);
-		}
+		$control->setAttribute('size', $cols);
 		return $this[$name] = $control->setType('password');
 	}
 
@@ -269,11 +263,8 @@ public function addPassword($name, $label = NULL, $cols = NULL, $maxLength = NUL
 	public function addTextArea($name, $label = NULL, $cols = NULL, $rows = NULL)
 	{
 		$control = new Controls\TextArea($label);
-		if ($cols) {
-			trigger_error(__METHOD__ . '() parameters $cols is deprecated, use setAttribute("cols", ...).', E_USER_DEPRECATED);
-			$control->setAttribute('cols', $cols);
-		}
-		return $this[$name] = $control->setAttribute('rows', $rows);
+		$control->setAttribute('cols', $cols)->setAttribute('rows', $rows);
+		return $this[$name] = $control;
 	}
 
 

diff --git a/tests/Forms.Latte/expected/FormMacros.forms.html b/tests/Forms.Latte/expected/FormMacros.forms.html
@@ -5,11 +5,11 @@
 
 		 <input type="hidden" name="id" id="frm-id" value="" title="Hello" size="10">
 		<label for="frm-username">Username:</label>
-<input type="text" name="username" id="frm-username" value="" title="Hello" size="10">		error
+<input type="text" name="username" size="10" id="frm-username" value="" title="Hello">		error
 error
 		<br>
 
-		<label for="frm-username" title="hello"> <input type="text" name="username" id="frm-username" value="" title="Hello" size="10"> </label>
+		<label for="frm-username" title="hello"> <input type="text" name="username" size="10" id="frm-username" value="" title="Hello"> </label>
 error		<label for="frm-select"></label>
 <select name="select" id="frm-select" title="Hello" size="10"><option value="m">male</option><option value="f">female</option></select>