Changeset 7051

Timestamp:

01/14/08 15:57:32 (10 months ago)

Author:

fabien

Message:

fixed cloning sfWidgetFormSchema, sfValidatorSchema and sfForm objects

Files:

• branches/1.1/lib/form/sfForm.class.php (modified) (1 diff)
• branches/1.1/lib/validator/sfValidatorSchema.class.php (modified) (1 diff)
• branches/1.1/lib/widget/sfWidgetFormSchema.class.php (modified) (1 diff)
• branches/1.1/test/unit/form/sfFormTest.php (modified) (4 diffs)
• branches/1.1/test/unit/validator/sfValidatorSchemaTest.php (modified) (2 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php (modified) (2 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormSchemaTest.php (modified) (2 diffs)

branches/1.1/lib/form/sfForm.class.php

@@ -735 +735 @@
-    return $str;
-  }
+
+  public function __clone()
+  {
+    $this->widgetSchema    = clone $this->widgetSchema;
+    $this->validatorSchema = clone $this->validatorSchema;
+
+    // we rebind the cloned form because Exceptions are not clonable
+    $this->bind($this->taintedValues, $this->taintedFiles);
+  }
-}

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

@@ -345 +345 @@
-    throw new Exception('Unable to convert a sfValidatorSchema to string.');
-  }
+
+  public function __clone()
+  {
+    foreach ($this->fields as $name => $field)
+    {
+      $this->fields[$name] = clone $field;
+    }
+  }
-}

branches/1.1/lib/widget/sfWidgetFormSchema.class.php

@@ -591 +591 @@
-    }
-  }
+
+  public function __clone()
+  {
+    foreach ($this->fields as $name => $field)
+    {
+      $this->fields[$name] = clone $field;
+    }
+  }
-}

branches/1.1/test/unit/form/sfFormTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-76
+82
-
-class FormTest extends sfForm
@@ -240 +240 @@
-$d = $article->getDefaults();
-
-is($v['author']['first_name'],
-is($w['author']['first_name'],
+ok($v['author']['first_name'] ==
+ok($w['author']['first_name'] ==
-$t->is($d['author']['first_name'], 'Fabien', '->embedForm() merges default values from the embedded form');
-$t->is($v['author'][sfForm::getCSRFFieldName()], null, '->embedForm() removes the CSRF token for the embedded form');
@@ -255 +255 @@
-for ($i = 0; $i < 2; $i++)
-{
-is($v['authors'][$i]['first_name'],
-is($w['authors'][$i]['first_name'],
+ok($v['authors'][$i]['first_name'] ==
+ok($w['authors'][$i]['first_name'] ==
-  $t->is($d['authors'][$i]['first_name'], 'Fabien', '->embedFormForEach() merges default values from the embedded forms');
-  $t->is($v['authors'][$i][sfForm::getCSRFFieldName()], null, '->embedFormForEach() removes the CSRF token for the embedded forms');
@@ -424 +424 @@
-$t->is_deeply(sfForm::convertFileInformation($input), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
-$t->is_deeply(sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
+
+// __clone()
+$t->diag('__clone()');
+$a = new FormTest();
+$a->setValidatorSchema(new sfValidatorSchema(array(
+  'first_name' => new sfValidatorString(array('min_length' => 2)),
+)));
+$a->bind(array('first_name' => 'F'));
+$a1 = clone $a;
+
+$t->ok($a1->getValidatorSchema() !== $a->getValidatorSchema(), '__clone() clones the validator schema');
+$t->ok($a1->getValidatorSchema() == $a->getValidatorSchema(), '__clone() clones the validator schema');
+
+$t->ok($a1->getWidgetSchema() !== $a->getWidgetSchema(), '__clone() clones the widget schema');
+$t->ok($a1->getWidgetSchema() == $a->getWidgetSchema(), '__clone() clones the widget schema');
+
+$t->ok($a1->getErrorSchema() !== $a->getErrorSchema(), '__clone() clones the error schema');
+$t->ok($a1->getErrorSchema()->getMessage() == $a->getErrorSchema()->getMessage(), '__clone() clones the error schema');

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+8
-
-class PreValidator extends sfValidator
@@ -368 +368 @@
-  $t->is($e->getCode(), 'invalid user [invalid password [invalid]] password [invalid]', '->clean() throws an exception with all error messages');
-}
+
+// __clone()
+$t->diag('__clone()');
+$v = new sfValidatorSchema(array('v1' => $v1, 'v2' => $v2));
+$v1 = clone $v;
+$f1 = $v1->getFields();
+$f = $v->getFields();
+$t->is(array_keys($f1), array_keys($f), '__clone() clones embedded validators');
+foreach ($f1 as $name => $validator)
+{
+  $t->ok($validator !== $f[$name], '__clone() clones embedded validators');
+  $t->ok($validator == $f[$name], '__clone() clones embedded validators');
+}

branches/1.1/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-6
+7
-
-$w1 = new sfWidgetFormInput();
@@ -72 +72 @@
-$w1 = clone $w;
-$t->ok($w1->getWidget() !== $w->getWidget(), '__clone() clones the embedded widget');
+$t->ok($w1->getWidget() == $w->getWidget(), '__clone() clones the embedded widget');

branches/1.1/test/unit/widget/sfWidgetFormSchemaTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-0
+5
-
-$w1 = new sfWidgetFormInput(array(), array('class' => 'foo1'));
@@ -270 +270 @@
-$rendered = $w->render(null, array('w1' => 'Fabien', 'w2' => 'Potencier'), array(), array('first_name' => 'Too short', 'Global error message', 'id' => 'Required'));
-$t->is($rendered, $expected, '->render() renders a schema to HTML');
+
+// __clone()
+$t->diag('__clone()');
+$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$w1 = clone $w;
+$f1 = $w1->getFields();
+$f = $w->getFields();
+$t->is(array_keys($f1), array_keys($f), '__clone() clones embedded widgets');
+foreach ($f1 as $name => $widget)
+{
+  $t->ok($widget !== $f[$name], '__clone() clones embedded widgets');
+  $t->ok($widget == $f[$name], '__clone() clones embedded widgets');
+}