Container: added addEmail() & addInteger()

Author: dg

src/Forms/Container.php

@@ -273,6 +273,34 @@ public function addTextArea($name, $label = NULL, $cols = NULL, $rows = NULL)
 	}
 
 
+	/**
+	 * Adds input for email.
+	 * @param  string  control name
+	 * @param  string  label
+	 * @return Controls\TextInput
+	 */
+	public function addEmail($name, $label = NULL)
+	{
+		return $this[$name] = (new Controls\TextInput($label))
+			->setRequired(FALSE)
+			->addRule(Form::EMAIL);
+	}
+
+
+	/**
+	 * Adds input for integer.
+	 * @param  string  control name
+	 * @param  string  label
+	 * @return Controls\TextInput
+	 */
+	public function addInteger($name, $label = NULL)
+	{
+		return $this[$name] = (new Controls\TextInput($label))
+			->setRequired(FALSE)
+			->addRule(Form::INTEGER);
+	}
+
+
 	/**
 	 * Adds control that allows the user to upload files.
 	 * @param  string  control name

tests/Forms/Forms.renderer.1.expect

@@ -14,7 +14,7 @@
 <tr class="required">
 	<th><label for="frm-age" class="required">Your age:</label></th>
 
-	<td><input type="number" name="age" id="frm-age" required data-nette-rules='[{"op":":filled","msg":"Enter your age"},{"op":":integer","msg":"Age must be numeric value"},{"op":":range","msg":"Age must be in range from 10 to 100","arg":[10,100]}]' min="10" max="100" class="text">
+	<td><input type="number" name="age" id="frm-age" required data-nette-rules='[{"op":":filled","msg":"Enter your age"},{"op":":integer","msg":"Please enter a valid integer."},{"op":":range","msg":"Age must be in range from 10 to 100","arg":[10,100]}]' min="10" max="100" class="text">
 
 	<span class="error">
 		Enter your age
@@ -31,7 +31,7 @@
 <tr>
 	<th><label for="frm-email">Email:</label></th>
 
-	<td><input type="text" name="email" id="frm-email" data-nette-rules='[{"op":":filled","rules":[{"op":":email","msg":"Incorrect email address"}],"control":"email"}]' data-nette-empty-value="&#64;" value="&#64;" class="text"></td>
+	<td><input type="email" name="email" id="frm-email" data-nette-rules='[{"op":"optional"},{"op":":email","msg":"Please enter a valid email address."}]' data-nette-empty-value="&#64;" value="&#64;" class="text"></td>
 </tr>
 </table>
 </fieldset>

tests/Forms/Forms.renderer.1.phpt

@@ -43,17 +43,14 @@ $form->addGroup('Personal data')
 $form->addText('name', 'Your name:')
 	->addRule(Form::FILLED, 'Enter your name');
 
-$form->addText('age', 'Your age:')
+$form->addInteger('age', 'Your age:')
 	->addRule(Form::FILLED, 'Enter your age')
-	->addRule(Form::INTEGER, 'Age must be numeric value')
 	->addRule(Form::RANGE, 'Age must be in range from %d to %d', [10, 100]);
 
 $form->addRadioList('gender', 'Your gender:', $sex);
 
-$form->addText('email', 'Email:')
-	->setEmptyValue('@')
-	->addCondition(Form::FILLED)
-		->addRule(Form::EMAIL, 'Incorrect email address');
+$form->addEmail('email', 'Email:')
+	->setEmptyValue('@');
 
 
 $form->addGroup('Shipping address')