Changeset 17587

Timestamp:

04/24/09 20:41:19 (3 years ago)

Author:

Kris.Wallsmith

Message:

[1.1, 1.2, 1.3] fixed rare occassion when a widget schema is paired with a simple validator error rather than a validator error schema

Files:

• branches/1.1/lib/form/sfFormFieldSchema.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) (2 diffs)
• branches/1.2/lib/form/sfFormFieldSchema.class.php (modified) (1 diff)
• branches/1.2/lib/widget/sfWidgetFormSchema.class.php (modified) (1 diff)
• branches/1.2/test/unit/form/sfFormTest.php (modified) (2 diffs)
• branches/1.3/lib/form/sfFormFieldSchema.class.php (modified) (1 diff)
• branches/1.3/lib/widget/sfWidgetFormSchema.class.php (modified) (1 diff)
• branches/1.3/test/unit/form/sfFormTest.php (modified) (2 diffs)

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

@@ -68 +68 @@
-      }
-
-class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField'
+error = isset($this->error[$name]) ? $this->error[$name] : null
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

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

@@ -327 +327 @@
-    {
-      throw new InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
+    }
+
+    if ($widget instanceof sfWidgetFormSchema && $errors && !$errors instanceof sfValidatorErrorSchema)
+    {
+      $errors = new sfValidatorErrorSchema($errors->getValidator(), array($errors));
-    }
-

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+5
-
-class FormTest extends sfForm
@@ -382 +382 @@
-
-$t->is($w['authors'][0]->generateName('first_name'), 'article[authors][0][first_name]', '->embedFormForEach() changes the name format to reflect the embedding');
+
+// bind too many values for embedded forms
+$t->diag('bind too many values for embedded forms');
+$list = new FormTest();
+$list->setWidgets(array('title' => new sfWidgetFormInput()));
+$list->setValidators(array('title' => new sfValidatorString()));
+$list->embedFormForEach('items', clone $list, 2);
+$list->bind(array(
+  'title' => 'list title',
+  'items' => array(
+    array('title' => 'item 1'),
+    array('title' => 'item 2'),
+    array('title' => 'extra item'),
+  ),
+));
+
+$t->isa_ok($list['items'][0]->getError(), 'sfValidatorErrorSchema', '"sfFormFieldSchema" is given an error schema when an extra embedded form is bound');
+
+// does this trigger a fatal error?
+$list['items']->render();
+$t->pass('"sfFormFieldSchema" renders when an extra embedded form is bound');
-
-// ::convertFileInformation()

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

@@ -68 +68 @@
-      }
-
-class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField'
+error = isset($this->error[$name]) ? $this->error[$name] : null
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

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

@@ -455 +455 @@
-    {
-      throw new InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
+    }
+
+    if ($widget instanceof sfWidgetFormSchema && $errors && !$errors instanceof sfValidatorErrorSchema)
+    {
+      $errors = new sfValidatorErrorSchema($errors->getValidator(), array($errors));
-    }
-

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-38
+40
-
-class FormTest extends sfForm
@@ -505 +505 @@
-
-$t->is($w['authors'][0]->generateName('first_name'), 'article[authors][0][first_name]', '->embedFormForEach() changes the name format to reflect the embedding');
+
+// bind too many values for embedded forms
+$t->diag('bind too many values for embedded forms');
+$list = new FormTest();
+$list->setWidgets(array('title' => new sfWidgetFormInput()));
+$list->setValidators(array('title' => new sfValidatorString()));
+$list->embedFormForEach('items', clone $list, 2);
+$list->bind(array(
+  'title' => 'list title',
+  'items' => array(
+    array('title' => 'item 1'),
+    array('title' => 'item 2'),
+    array('title' => 'extra item'),
+  ),
+));
+
+$t->isa_ok($list['items'][0]->getError(), 'sfValidatorErrorSchema', '"sfFormFieldSchema" is given an error schema when an extra embedded form is bound');
+
+// does this trigger a fatal error?
+$list['items']->render();
+$t->pass('"sfFormFieldSchema" renders when an extra embedded form is bound');
-
-// ->getEmbeddedForms()

branches/1.3/lib/form/sfFormFieldSchema.class.php

@@ -68 +68 @@
-      }
-
-class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField'
+error = isset($this->error[$name]) ? $this->error[$name] : null
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

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

@@ -455 +455 @@
-    {
-      throw new InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
+    }
+
+    if ($widget instanceof sfWidgetFormSchema && $errors && !$errors instanceof sfValidatorErrorSchema)
+    {
+      $errors = new sfValidatorErrorSchema($errors->getValidator(), array($errors));
-    }
-

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-38
+40
-
-class FormTest extends sfForm
@@ -505 +505 @@
-
-$t->is($w['authors'][0]->generateName('first_name'), 'article[authors][0][first_name]', '->embedFormForEach() changes the name format to reflect the embedding');
+
+// bind too many values for embedded forms
+$t->diag('bind too many values for embedded forms');
+$list = new FormTest();
+$list->setWidgets(array('title' => new sfWidgetFormInput()));
+$list->setValidators(array('title' => new sfValidatorString()));
+$list->embedFormForEach('items', clone $list, 2);
+$list->bind(array(
+  'title' => 'list title',
+  'items' => array(
+    array('title' => 'item 1'),
+    array('title' => 'item 2'),
+    array('title' => 'extra item'),
+  ),
+));
+
+$t->isa_ok($list['items'][0]->getError(), 'sfValidatorErrorSchema', '"sfFormFieldSchema" is given an error schema when an extra embedded form is bound');
+
+// does this trigger a fatal error?
+$list['items']->render();
+$t->pass('"sfFormFieldSchema" renders when an extra embedded form is bound');
-
-// ->getEmbeddedForms()