Changeset 7046

Timestamp:

01/14/08 13:25:22 (10 months ago)

Author:

fabien

Message:

implemented all proxy methods in sfWidgetFormSchemaDecorator

Files:

• branches/1.1/lib/widget/sfWidgetFormSchemaDecorator.class.php (modified) (5 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php (modified) (4 diffs)

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

@@ -26 +26 @@
-   * Constructor.
-   *
-   * The decorated widget is cloned.
-   *
-   * @param sfWidgetFormSchema A sfWidgetFormSchema instance
-   * @param string             A decorator string
@@ -35 +33 @@
-  public function __construct(sfWidgetFormSchema $widget, $decorator)
-  {
-clone 
+
-    $this->decorator = $decorator;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -53 +54 @@
-  public function render($name, $values = array(), $attributes = array(), $errors = array())
-  {
-    $this->widget->setNameFormat($this->nameFormat);
-    foreach ($this->formFormatters as $name => $formFormatter)
-    {
-      $this->widget->addFormFormatter($name, $formFormatter);
-    }
-    $this->widget->setFormFormatterName($this->formFormatter);
-
-    $this->widget->setAttributes($this->attributes);
-    $this->widget->setOptions($this->options);
-    $this->widget->setLabels($this->labels);
-    $this->widget->setHelps($this->helps);
-
-    return strtr($this->decorator, array('%content%' => $this->widget->render($name, $values, $attributes, $errors)));
-  }
@@ -71 +60 @@
-   * @see sfWidgetFormSchema
-   */
+  public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
+  {
+    return $this->widget->addFormFormatter($name, $formatter);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getFormFormatters()
+  {
+    return $this->widget->getFormFormatters();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setFormFormatterName($name)
+  {
+    $this->widget->setFormFormatterName($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getFormFormatterName()
+  {
+    return $this->widget->getFormFormatterName();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getFormFormatter()
+  {
+    return $this->widget->getFormFormatter();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setNameFormat($format)
+  {
+    $this->widget->setNameFormat($format);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getNameFormat()
+  {
+    return $this->widget->getNameFormat();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setLabels($labels)
+  {
+    $this->widget->setLabels($labels);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getLabels()
+  {
+    return $this->widget->getLabels();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setLabel($name, $value)
+  {
+    $this->widget->setLabel($name, $value);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getLabel($name)
+  {
+    return $this->widget->getLabel($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setHelps($helps)
+  {
+    $this->widget->setHelps($helps);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getHelps()
+  {
+    return $this->widget->getHelps();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setHelp($name, $help)
+  {
+    $this->widget->setHelp($name, $help);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getHelp($name)
+  {
+    return $this->widget->getHelp($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function needsMultipartForm()
+  {
+    return $this->widget->needsMultipartForm();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function renderField($name, $value = null, $errors = array())
+  {
+    return $this->widget->renderField($name, $value, $errors);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function generateLabel($name)
+  {
+    return $this->widget->generateLabel($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function generateLabelName($name)
+  {
+    return $this->widget->generateLabelName($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function generateName($name)
+  {
+    return $this->widget->generateName($name);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getParent()
+  {
+    return $this->widget->getParent();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setParent(sfWidgetFormSchema $parent)
+  {
+    $this->widget->setParent($parent);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getFields()
+  {
+    return $this->widget->getFields();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function getPositions()
+  {
+    return $this->widget->getPositions();
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function setPositions($positions)
+  {
+    $this->widget->setPositions($positions);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
+  public function moveField($field, $action, $pivot = null)
+  {
+    return $this->widget->moveField($field, $action, $pivot);
+  }
+
+  /**
+   * @see sfWidgetFormSchema
+   */
-  public function offsetExists($name)
-  {
@@ -100 +297 @@
-  }
-
-
-
-
-
-
-
+
+
+
-  }
-}

branches/1.1/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-9
+15
-
-$w1 = new sfWidgetFormInput();
@@ -18 +18 @@
-
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
+
+// ->getWidget()
+$t->diag('->getWidget()');
+$t->is($w->getWidget(), $ws, '->getWidget() returns the decorated widget');
-
-// ->render()
@@ -35 +39 @@
-$w['w2'] = $w2;
-$t->is($w->getFields(), array('w1' => $w1, 'w2' => $w2), 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-
+, 'w2' => $w2
-
-try
@@ -49 +53 @@
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
-$t->is(isset($w['w1']), true, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-
+
+
+
-
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
-$t->is($w['w1'], $w1, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-
+
+
+
-
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
-unset($w['w1']);
-$t->is($w['w1'], null, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
+$t->is($ws['w1'], null, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');