Changeset 7052

Timestamp:

01/14/08 19:11:44 (1 year ago)

Author:

fabien

Message:

fixed sfValidatorSchema::clone() for pre and post validators

Files:

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

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

@@ -352 +352 @@
-      $this->fields[$name] = clone $field;
-    }
+
+    if (!is_null($this->preValidator))
+    {
+      $this->preValidator = clone $this->preValidator;
+    }
+
+    if (!is_null($this->postValidator))
+    {
+      $this->postValidator = clone $this->postValidator;
+    }
-  }
-}

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-78
+84
-
-class PreValidator extends sfValidator
@@ -381 +381 @@
-  $t->ok($validator == $f[$name], '__clone() clones embedded validators');
-}
+$t->is($v1->getPreValidator(), null, '__clone() clones the pre validator');
+$t->is($v1->getPostValidator(), null, '__clone() clones the post validator');
+
+$v->setPreValidator(new sfValidatorString(array('min_length' => 4)));
+$v->setPostValidator(new sfValidatorString(array('min_length' => 4)));
+$v1 = clone $v;
+$t->ok($v1->getPreValidator() !== $v->getPreValidator(), '__clone() clones the pre validator');
+$t->ok($v1->getPreValidator() == $v->getPreValidator(), '__clone() clones the pre validator');
+$t->ok($v1->getPostValidator() !== $v->getPostValidator(), '__clone() clones the post validator');
+$t->ok($v1->getPostValidator() == $v->getPostValidator(), '__clone() clones the post validator');