Changeset 6944

Timestamp:

01/05/08 13:51:12 (11 months ago)

Author:

fabien

Message:

added sfForm::setValidators() and sfForm::setWidgets()

Files:

• branches/1.1/lib/form/sfForm.class.php (modified) (2 diffs)
• branches/1.1/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php (modified) (3 diffs)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseArticleForm.class.php (modified) (3 diffs)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseAuthorArticleForm.class.php (modified) (1 diff)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseAuthorForm.class.php (modified) (1 diff)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseBookForm.class.php (modified) (1 diff)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseCategoryForm.class.php (modified) (1 diff)
• branches/1.1/test/unit/form/sfFormTest.php (modified) (2 diffs)

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

@@ -275 +275 @@
-
-  /**
+   * Sets the validators associated with this form.
+   *
+   * @param array An array of named validators
+   */
+  public function setValidators(array $validators)
+  {
+    $this->setValidatorSchema(new sfValidatorSchema($validators));
+  }
+
+  /**
-   * Sets the validator schema associated with this form.
-   *
@@ -294 +304 @@
-  {
-    return $this->validatorSchema;
+  }
+
+  /**
+   * Sets the widgets associated with this form.
+   *
+   * @param array An array of named widgets
+   */
+  public function setWidgets(array $widgets)
+  {
+    $this->setWidgetSchema(new sfWidgetFormSchema($widgets));
-  }
-

branches/1.1/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php

@@ -13 +13 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-<?php foreach ($this->table->getColumns() as $column): ?>
-      '<?php echo strtolower($column->getColumnName()) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getColumnName())) ?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>),
@@ -20 +20 @@
-      '<?php echo $tables['relatedTable']->getName() ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($tables['relatedTable']->getName().'_list')) ?> => new sfWidgetFormSelectMany(array('choices' => new sfCallable(array($this, 'get<?php echo $tables['relatedTable']->getPhpName() ?>Choices')))),
-<?php endforeach; ?>
-)
+
-
-Schema(new sfValidatorSchema
+s
-<?php foreach ($this->table->getColumns() as $column): ?>
-      '<?php echo strtolower($column->getColumnName()) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getColumnName())) ?> => new <?php echo $this->getValidatorClassForColumn($column) ?>(<?php echo $this->getValidatorOptionsForColumn($column) ?>),
@@ -29 +29 @@
-      '<?php echo $tables['relatedTable']->getName() ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($tables['relatedTable']->getName().'_list')) ?> => new sfValidatorChoiceMany(array('choices' => new sfCallable(array($this, 'get<?php echo $tables['relatedTable']->getPhpName() ?>IdentifierChoices')))),
-<?php endforeach; ?>
-)
+
-
-    $this->widgetSchema->setNameFormat('<?php echo $this->table->getName() ?>[%s]');

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseArticleForm.class.php

@@ -12 +12 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-      'id'          => new sfWidgetFormInputHidden(),
-      'title'       => new sfWidgetFormInput(),
@@ -21 +21 @@
-      'end_date'    => new sfWidgetFormDateTime(),
-      'book_id'     => new sfWidgetFormSelect(array('choices' => new sfCallable(array($this, 'getBookChoices')))),
-)
+
-
-Schema(new sfValidatorSchema
+s
-      'id'          => new sfValidatorInteger(array('required' => false)),
-      'title'       => new sfValidatorString(),
@@ -32 +32 @@
-      'end_date'    => new sfValidatorDateTime(array('required' => false)),
-      'book_id'     => new sfValidatorChoice(array('choices' => new sfCallable(array($this, 'getBookIdentifierChoices')), 'required' => false)),
-)
+
-
-    $this->widgetSchema->setNameFormat('article[%s]');

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseAuthorArticleForm.class.php

@@ -12 +12 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-      'author_id'  => new sfWidgetFormSelect(array('choices' => new sfCallable(array($this, 'getAuthorChoices')))),
-      'article_id' => new sfWidgetFormSelect(array('choices' => new sfCallable(array($this, 'getArticleChoices')))),
-      'id'         => new sfWidgetFormInputHidden(),
-)
+
-
-Schema(new sfValidatorSchema
+s
-      'author_id'  => new sfValidatorChoice(array('choices' => new sfCallable(array($this, 'getAuthorIdentifierChoices')), 'required' => false)),
-      'article_id' => new sfValidatorChoice(array('choices' => new sfCallable(array($this, 'getArticleIdentifierChoices')), 'required' => false)),
-      'id'         => new sfValidatorInteger(array('required' => false)),
-)
+
-
-    $this->widgetSchema->setNameFormat('author_article[%s]');

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseAuthorForm.class.php

@@ -12 +12 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-      'id'   => new sfWidgetFormInputHidden(),
-      'name' => new sfWidgetFormInput(),
-)
+
-
-Schema(new sfValidatorSchema
+s
-      'id'   => new sfValidatorInteger(array('required' => false)),
-      'name' => new sfValidatorString(array('required' => false)),
-)
+
-
-    $this->widgetSchema->setNameFormat('author[%s]');

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseBookForm.class.php

@@ -12 +12 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-      'id'   => new sfWidgetFormInputHidden(),
-      'name' => new sfWidgetFormInput(),
-)
+
-
-Schema(new sfValidatorSchema
+s
-      'id'   => new sfValidatorInteger(array('required' => false)),
-      'name' => new sfValidatorString(array('required' => false)),
-)
+
-
-    $this->widgetSchema->setNameFormat('book[%s]');

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/base/BaseCategoryForm.class.php

@@ -12 +12 @@
-  public function setup()
-  {
-Schema(new sfWidgetFormSchema
+s
-      'id'   => new sfWidgetFormInputHidden(),
-      'name' => new sfWidgetFormInput(),
-)
+
-
-Schema(new sfValidatorSchema
+s
-      'id'   => new sfValidatorInteger(array('required' => false)),
-      'name' => new sfValidatorString(array('required' => false)),
-)
+
-
-    $this->widgetSchema->setNameFormat('category[%s]');

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-68
+74
-
-class FormTest extends sfForm
@@ -105 +105 @@
-$t->ok($f->isMultipart(),'->isMultipart() returns true if the form needs a multipart form');
-
+// ->setValidators() ->setValidatorSchema() ->getValidatorSchema()
+$t->diag('->setValidators() ->setValidatorSchema() ->getValidatorSchema()');
+$f = new FormTest();
+$validators = array(
+  'first_name' => new sfValidatorPass(),
+  'last_name' => new sfValidatorPass(),
+);
+$validatorSchema = new sfValidatorSchema($validators);
+$f->setValidatorSchema($validatorSchema);
+$t->is_deeply($f->getValidatorSchema(), $validatorSchema, '->setValidatorSchema() sets the current validator schema');
+$f->setValidators($validators);
+$schema = $f->getValidatorSchema();
+$t->is_deeply($schema['first_name'], $validators['first_name'], '->setValidators() sets field validators');
+$t->is_deeply($schema['last_name'], $validators['last_name'], '->setValidators() sets field validators');
+
+// ->setWidgets() ->setWidgetSchema() ->getWidgetSchema()
+$t->diag('->setWidgets() ->setWidgetSchema() ->getWidgetSchema()');
+$f = new FormTest();
+$widgets = array(
+  'first_name' => new sfWidgetFormInput(),
+  'last_name'  => new sfWidgetFormInput(),
+);
+$widgetSchema = new sfWidgetFormSchema($widgets);
+$f->setWidgetSchema($widgetSchema);
+$t->is_deeply($f->getWidgetSchema(), $widgetSchema, '->setWidgetSchema() sets the current widget schema');
+$f->setWidgets($widgets);
+$schema = $f->getWidgetSchema();
+$t->is_deeply($schema['first_name'], $widgets['first_name'], '->setWidgets() sets field widgets');
+$t->is_deeply($schema['last_name'], $widgets['last_name'], '->setWidgets() sets field widgets');
+
-// ArrayAccess interface
-$t->diag('ArrayAccess interface');