Changeset 11383

Timestamp:

09/09/08 00:06:56 (5 years ago)

Author:

Kris.Wallsmith

Message:

sfFormtasticPlugin: Added ->toJson() method to error schema class.

Files:

• plugins/sfFormtasticPlugin/trunk/config/app.yml (added)
• plugins/sfFormtasticPlugin/trunk/lib/form/sfFormtasticBase.class.php (modified) (1 diff)
• plugins/sfFormtasticPlugin/trunk/lib/validator/sfValidatornatorErrorSchema.class.php (modified) (1 diff)
• plugins/sfFormtasticPlugin/trunk/test/unit/sfFormtasticBaseTest.php (modified) (2 diffs)
• plugins/sfFormtasticPlugin/trunk/test/unit/sfValidatornatorErrorSchemaTest.php (added)

plugins/sfFormtasticPlugin/trunk/lib/form/sfFormtasticBase.class.php

@@ -104 +104 @@
-   * @see sfForm
-   */
+  public function bind(array $taintedValues = null, array $taintedFiles = null)
+  {
+    parent::bind($taintedValues, $taintedFiles);
+    
+    // replace sfValidatorErrorSchema
+    $this->errorSchema = new sfValidatornatorErrorSchema($this->validatorSchema, $this->errorSchema);
+  }
+  
+  /**
+   * @see sfForm
+   */
-  public function render($attributes = array())
-  {

plugins/sfFormtasticPlugin/trunk/lib/validator/sfValidatornatorErrorSchema.class.php

@@ -14 +14 @@
-class sfValidatornatorErrorSchema extends sfValidatornatorErrorSchemaBase
-{
+  /**
+   * Returns the current error schema serialized as JSON.
+   * 
+   * @return  string
+   */
+  public function toJson()
+  {
+    $callable = sfConfig::get('app_sf_formtastic_plugin_json_encode_callable', 'json_encode');
+    if (!is_callable($callable))
+    {
+      throw new RuntimeException(sprintf('The json_encoder_callable "%s" does not exist.', var_export($callable, true)));
+    }
+    
+    // build an array of scalars
+    $data = array();
+    foreach ($this->globalErrors as $error)
+    {
+      if (!isset($data['_global']))
+      {
+        $data['_global'] = array();
+      }
+      $data['_global'][] = $error->getMessage();
+    }
+    foreach ($this->getNamedErrors() as $name => $error)
+    {
+      if (!isset($data[$name]))
+      {
+        $data[$name] = array();
+      }
+      $data[$name][] = $error->getMessage();
+    }
+    
+    return call_user_func($callable, $data);
+  }
-}

plugins/sfFormtasticPlugin/trunk/test/unit/sfFormtasticBaseTest.php

@@ -3 +3 @@
-include dirname(__FILE__).'/../bootstrap/unit.php';
-
-19
+21
-
-sfForm::enableCSRFProtection('secretastic');
@@ -58 +58 @@
-$form->setIdFormat(false);
-$t->unlike($form->render(), '/id="/', '"->setIdFormat(false)" removes id attribute');
+
+$t->diag('->bind()');
+$form->bind(array('name' => 'xyztastic'));
+$t->isa_ok($form->getErrorSchema(), 'sfValidatornatorErrorSchema', '->bind() copies native error schema');
+$t->is(count($form->getErrorSchema()), 1, '->bind() copies the correct number of errors');