added Rules::addFilter()

nette · Feb 18, 2015 · 06c51d9 · 06c51d9
1 parent 8871974
commit 06c51d9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/src/Forms/Controls/TextBase.php b/src/Forms/Controls/TextBase.php
@@ -96,11 +96,8 @@ public function setMaxLength($length)
 	 */
 	public function addFilter($filter)
 	{
-		Nette\Utils\Callback::check($filter);
-		return parent::addRule(function($control) use ($filter) {
-			$control->setValue( call_user_func($filter, $control->getValue()) );
-			return TRUE;
-		});
+		$this->rules->addFilter($filter);
+		return $this;
 	}
 
 

diff --git a/src/Forms/Rules.php b/src/Forms/Rules.php
@@ -151,6 +151,24 @@ public function endCondition()
 	}
 
 
+	/**
+	 * Adds a filter callback.
+	 * @param  callable
+	 * @return self
+	 */
+	public function addFilter($filter)
+	{
+		Nette\Utils\Callback::check($filter);
+		$this->rules[] = $rule = new Rule;
+		$rule->control = $this->control;
+		$rule->validator = function($control) use ($filter) {
+			$control->setValue( call_user_func($filter, $control->getValue()) );
+			return TRUE;
+		};
+		return $this;
+	}
+
+
 	/**
 	 * Toggles HTML element visibility.
 	 * @param  string     element id

diff --git a/tests/Forms/Controls.TextBase.loadData.phpt b/tests/Forms/Controls.TextBase.loadData.phpt
@@ -173,3 +173,17 @@ test(function() { // filter
 	$input->validate();
 	Assert::same( 'olleh', $input->getValue() );
 });
+
+
+test(function() { // filter in condition
+	$_POST = array('text' => 'hello');
+
+	$form = new Form;
+	$input = $form->addText('text');
+	$input->addCondition($form::FILLED)
+			->addFilter('strrev');
+
+	Assert::same( 'hello', $input->getValue() );
+	$input->validate();
+	Assert::same( 'olleh', $input->getValue() );
+});