Changeset 6942

Timestamp:

01/05/08 13:34:22 (1 year ago)

Author:

fabien

Message:

replaced _pre_validator and _post_validator by setPreValidator() and setPostValidator() methods (update your forms accordingly)

Files:

• branches/1.1/lib/validator/sfValidator.class.php (modified) (1 diff)
• branches/1.1/lib/validator/sfValidatorSchema.class.php (modified) (5 diffs)
• branches/1.1/test/unit/validator/sfValidatorSchemaTest.php (modified) (2 diffs)

branches/1.1/lib/validator/sfValidator.class.php

@@ -296 +296 @@
-   * @throws sfValidatorError
-   */
- 
+
-
-  /**

branches/1.1/lib/validator/sfValidatorSchema.class.php

@@ -22 +22 @@
-{
-  protected
-
+
+
+
-
-  /**
@@ -103 +105 @@
-    }
-
-
+ 
-    $unused = array_keys($this->fields);
-    $errors = array();
-
-    // pre validator
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -156 +155 @@
-    foreach ($unused as $name)
-    {
-      if (in_array($name, array('_pre_validator', '_post_validator')))
-      {
-        continue;
-      }
-
-      // validate value
-      try
@@ -173 +167 @@
-
-    // post validator
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -191 +182 @@
-
-    return $clean;
+  }
+
+  /**
+   * Cleans the input values.
+   *
+   * This method is the first validator executed by doClean().
+   *
+   * It executes the validator returned by getPreValidator()
+   * on the global array of values.
+   *
+   * @param  array The input values
+   *
+   * @throws sfValidatorError
+   */
+  public function preClean($values)
+  {
+    if (is_null($validator = $this->getPreValidator()))
+    {
+      return;
+    }
+
+    $validator->clean($values);
+  }
+
+  /**
+   * Cleans the input values.
+   *
+   * This method is the last validator executed by doClean().
+   *
+   * It executes the validator returned by getPostValidator()
+   * on the global array of cleaned values.
+   *
+   * @param  array The input values
+   *
+   * @throws sfValidatorError
+   */
+  public function postClean($values)
+  {
+    if (is_null($validator = $this->getPostValidator()))
+    {
+      return $values;
+    }
+
+    return $validator->clean($values);
+  }
+
+  /**
+   * Sets the pre validator.
+   *
+   * @param sfValidator A sfValidator instance
+   */
+  public function setPreValidator(sfValidator $validator)
+  {
+    $this->preValidator = $validator;
+  }
+
+  /**
+   * Returns the pre validator.
+   *
+   * @return sfValidator A sfValidator instance
+   */
+  public function getPreValidator()
+  {
+    return $this->preValidator;
+  }
+
+  /**
+   * Sets the post validator.
+   *
+   * @param sfValidator A sfValidator instance
+   */
+  public function setPostValidator(sfValidator $validator)
+  {
+    $this->postValidator = $validator;
+  }
+
+  /**
+   * Returns the post validator.
+   *
+   * @return sfValidator A sfValidator instance
+   */
+  public function getPostValidator()
+  {
+    return $this->postValidator;
-  }
-

branches/1.1/test/unit/validator/sfValidatorSchemaTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-4
+6
-
-class PreValidator extends sfValidator
@@ -155 +155 @@
-}
-
-
+
+
-$v1 = new sfValidatorString(array('max_length' => 3, 'required' => false));
-$v2 = new sfValidatorString(array('min_length' => 3, 'required' => false));
-
+
+
+
-try
-{
-  $v->clean(array('s1' => 'foo', 's2' => 'bar'));
-_pre_
+pre-
-  $t->skip('', 2);
-}
-catch (sfValidatorErrorSchema $e)
-{
-_pre_
+pre-
-  $t->is(count($e), 1, '->clean() throws an exception with all error messages');
-  $t->is($e[0]->getCode(), 's1_or_s2', '->clean() throws an exception with all error messages');
-}
-
-
+
+
-$v1 = new sfValidatorString(array('max_length' => 3, 'required' => false));
-$v2 = new sfValidatorString(array('min_length' => 3, 'required' => false));
-
+
+
+
-$t->is($v->clean(array('s1' => 'foo', 's2' => 'bar')), array('s1' => '*foo*', 's2' => '*bar*'), '->clean() executes post validators');
-
-
+
+
-try
-{
-  $v->clean(array('s1' => 'foo', 's2' => 'foo'));
-_post_
+post-
-  $t->skip('', 2);
-}
-catch (sfValidatorErrorSchema $e)
-{
-_post_
+post-
-  $t->is(count($e), 1, '->clean() throws an exception with all error messages');
-  $t->is($e[0]->getCode(), 's1_not_equal_s2', '->clean() throws an exception with all error messages');