Changeset 11362

Timestamp:

09/07/08 19:19:25 (3 months ago)

Author:

FabianLange

Message:

1.2: fixed cloning of widgetformschema fails to clone formatter correctly. fixes #4328

Files:

• branches/1.2/lib/widget/sfWidgetFormSchema.class.php (modified) (1 diff)
• branches/1.2/lib/widget/sfWidgetFormSchemaFormatter.class.php (modified) (2 diffs)
• branches/1.2/test/unit/widget/sfWidgetFormSchemaTest.php (modified) (3 diffs)

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

@@ -676 +676 @@
-      $this[$name] = $field;
-    }
+    foreach ($this->formFormatters as &$formFormatter)
+    {
+      $formFormatter = clone $formFormatter;
+      $formFormatter->setWidgetSchema($this);
+    }
-  }
-}

branches/1.2/lib/widget/sfWidgetFormSchemaFormatter.class.php

@@ -40 +40 @@
-  public function __construct(sfWidgetFormSchema $widgetSchema)
-  {
-widgetSchema = $widgetSchema
+setWidgetSchema($widgetSchema)
-  }
-    
@@ -326 +326 @@
-    return $this->helpFormat;
-  }
+
+  public function setWidgetSchema($widgetSchema)
+  {
+    $this->widgetSchema = $widgetSchema;
+  }
-}

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-1
+3
-
-$w1 = new sfWidgetFormInput(array(), array('class' => 'foo1'));
@@ -349 +349 @@
-$t->diag('__clone()');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$format1 = new sfWidgetFormSchemaFormatterList($w);
+$format1->setTranslationCatalogue('english');
+$w->addFormFormatter('testFormatter', $format1);
-$w1 = clone $w;
-$f1 = $w1->getFields();
@@ -358 +361 @@
-  $t->ok($widget == $f[$name], '__clone() clones embedded widgets');
-}
+$format1->setTranslationCatalogue('french');
+$formatters = $w1->getFormFormatters();
+$t->is(count($formatters), 1 , '__clone() returns a sfWidgetFormSchema that has the Formatters attached');
+$t->is($formatters['testFormatter']->getTranslationCatalogue(), 'english', '__clone() clones formatters, so that changes to the original one have no effect to the cloned formatter.');
-
-// setDefaultFormFormatterName()