Changeset 11622

Timestamp:

09/17/08 20:47:31 (1 year ago)

Author:

nicolas

Message:

[1.2] forthport of r11621: fixed sfForm::mergeForm() doesn't merge widget schema labels (refs #4262)

Files:

• branches/1.2/lib/form/sfForm.class.php (modified) (4 diffs)
• branches/1.2/test/unit/form/sfFormTest.php (modified) (4 diffs)

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

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -269 +269 @@
-      throw new LogicException('A bound form cannot be embedded');
-    }
-
+
-    $form = clone $form;
-    unset($form[self::$CSRFFieldName]);
@@ -333 +333 @@
-
-  /**
- 
-
+
+. Please note it also merge defaults.
-   *
-   * @param  sfForm   $form      The sfForm instance to merge with current form
+   *
-   * @throws LogicException      If one of the form has already been bound
-   */
@@ -360 +361 @@
-      $this->validatorSchema[$field] = $validator;
-    }
+
+    $this->getWidgetSchema()->setLabels(array_merge($this->getWidgetSchema()->getLabels(),
+                                                    $form->getWidgetSchema()->getLabels()));
-
-    $this->mergePreValidator($form->getValidatorSchema()->getPreValidator());

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+3
-
-class FormTest extends sfForm
@@ -576 +576 @@
-      'c' => new sfValidatorString(array('max_length' => 1000)),
-    ));
+    $this->getWidgetSchema()->setLabels(array(
+      'a' => '1_a',
+      'b' => '1_b',
+      'c' => '1_c',
+    ));
-  }
-}
@@ -592 +597 @@
-      'd' => new sfValidatorString(array('max_length' => 5)),
-    ));
+    $this->getWidgetSchema()->setLabels(array(
+      'c' => '2_c',
+      'd' => '2_d',
+    ));
-    $this->validatorSchema->setPreValidator(new sfValidatorPass());
-    $this->validatorSchema->setPostValidator(new sfValidatorPass());
@@ -607 +616 @@
-$t->is(array_keys($widgetSchema->getFields()), array('a', 'b', 'c', 'd'), 'mergeForms() merges the correct widgets');
-$t->is(array_keys($validatorSchema->getFields()), array('a', 'b', 'c', 'd'), 'mergeForms() merges the correct validators');
+$t->is($widgetSchema->getLabels(), array('a' => '1_a', 'b' => '1_b', 'c' => '2_c', 'd' => '2_d'), 'mergeForm() merges labels correctly');
-$t->isa_ok($widgetSchema['c'], 'sfWidgetFormTextarea', 'mergeForm() overrides original form widget');
-$t->isa_ok($validatorSchema['c'], 'sfValidatorPass', 'mergeForm() overrides original form validator');