Merge pull request #105 from jeromemacias/fix_56

[RFP] Fix #56

Author: GromNaN

lib/form/sfForm.class.php

@@ -610,6 +610,10 @@ public function setValidators(array $validators)
    */
   public function setValidator($name, sfValidatorBase $validator)
   {
+    if (isset($this->embeddedForms[$name])) {
+      throw new LogicException('You cannot set a validator for an embedded form.');
+    }
+
     $this->validatorSchema[$name] = $validator;
 
     $this->resetFormFields();
@@ -631,6 +635,10 @@ public function getValidator($name)
       throw new InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
     }
 
+    if (isset($this->embeddedForms[$name])) {
+      return $this->embeddedForms[$name]->getValidatorSchema();
+    }
+
     return $this->validatorSchema[$name];
   }
 

test/unit/form/sfFormTest.php

@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(155);
+$t = new lime_test(157);
 
 class FormTest extends sfForm
 {
@@ -652,6 +652,18 @@ public function configure()
 $t->is($w['author']->generateName('first_name'), 'article[author][first_name]', '->embedForm() changes the name format to reflect the embedding');
 $t->is($w['author']['company']->generateName('name'), 'article[author][company][name]', '->embedForm() changes the name format to reflect the embedding');
 
+// tests for ticket #56
+$t->ok($author->getValidator('company') == $company_validator_schema, '->getValidator() gets a validator schema for an embedded form');
+try
+{
+  $author->setValidator('company', new sfValidatorPass());
+  $t->fail('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+}
+catch (LogicException $e)
+{
+  $t->pass('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+}
+
 // tests for ticket #4754
 $f1 = new TestForm1();
 $f2 = new TestForm2();