Changeset 7047

Timestamp:

01/14/08 14:50:17 (9 months ago)

Author:

fabien

Message:

splitted sfFormField in sfFormField and sfFormFieldSchema

Files:

• branches/1.1/lib/form/sfForm.class.php (modified) (3 diffs)
• branches/1.1/lib/form/sfFormField.class.php (modified) (4 diffs)
• branches/1.1/lib/form/sfFormFieldSchema.class.php (added)
• branches/1.1/test/unit/form/sfFormFieldSchemaTest.php (added)
• branches/1.1/test/unit/form/sfFormFieldTest.php (modified) (3 diffs)

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

@@ -573 +573 @@
-      $values = $this->isBound ? $this->taintedValues : $this->defaults;
-
-
+
+
+
-    }
-
@@ -609 +611 @@
-   * Returns a form field for the main widget schema.
-   *
- A sfFormField
+Schema A sfFormFieldSchema
-   */
-  protected function getFormField()
@@ -615 +617 @@
-    if (is_null($this->formField))
-    {
-
+Schema
-    }
-

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

@@ -17 +17 @@
- * @version    SVN: $Id$
- */
- implements ArrayAccess
+
-{
-  protected
@@ -24 +24 @@
-    $name   = '',
-    $value  = null,
-
-
+
-
-  /**
-   * Constructor.
-   *
-    
+Form
-   * @param sfFormField      The sfFormField parent instance (null for the root widget)
-   * @param string           The field name
@@ -36 +35 @@
-   * @param sfValidatorError A sfValidatorError instance
-   */
-
+Form
-  {
-    $this->widget = $widget;
@@ -202 +201 @@
-    return !is_null($this->error) && count($this->error);
-  }
-
-  /**
-   * Returns true if the bound field exists (implements the ArrayAccess interface).
-   *
-   * @param  string  The name of the bound field
-   *
-   * @return Boolean true if the widget exists, false otherwise
-   */
-  public function offsetExists($name)
-  {
-    return $this->widget instanceof sfWidgetFormSchema ? isset($this->widget[$name]) : false;
-  }
-
-  /**
-   * Returns the form field associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string      The offset of the value to get
-   *
-   * @return sfFormField A form field instance
-   */
-  public function offsetGet($name)
-  {
-    if (!isset($this->fields[$name]))
-    {
-      if (!$this->widget instanceof sfWidgetFormSchema)
-      {
-        throw new LogicException(sprintf('Cannot get a form field on a non widget schema (%s given).', get_class($this->widget)));
-      }
-
-      if (is_null($widget = $this->widget[$name]))
-      {
-        throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
-      }
-
-      $this->fields[$name] = new sfFormField($widget, $this, $name, isset($this->value[$name]) ? $this->value[$name] : null, isset($this->error[$name]) ? $this->error[$name] : null);
-    }
-
-    return $this->fields[$name];
-  }
-
-  /**
-   * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
-   *
-   * @param string (ignored)
-   * @param string (ignored)
-   *
-   * @throws <b>LogicException</b>
-   */
-  public function offsetSet($offset, $value)
-  {
-    throw new LogicException('Cannot update form fields (read-only).');
-  }
-
-  /**
-   * Throws an exception saying that values cannot be unset (implements the ArrayAccess interface).
-   *
-   * @param string (ignored)
-   *
-   * @throws LogicException
-   */
-  public function offsetUnset($offset)
-  {
-    throw new LogicException('Cannot remove form fields (read-only).');
-  }
-}

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-8
+1
-
-// widgets
@@ -33 +33 @@
-$articleErrorSchema->addError($authorErrorSchema, 'author');
-
-
+Schema
-$f = $parent['title'];
-$child = $parent['author'];
-
-// ArrayAccess interface
-$t->diag('ArrayAccess interface');
-$t->is(isset($parent['title']), true, 'sfFormField implements the ArrayAccess interface');
-$t->is(isset($parent['title1']), false, 'sfFormField implements the ArrayAccess interface');
-$t->is($parent['title'], $f, 'sfFormField implements the ArrayAccess interface');
-try
-{
-  unset($parent['title']);
-  $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-catch (LogicException $e)
-{
-  $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-
-try
-{
-  $parent['title'] = null;
-  $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-catch (LogicException $e)
-{
-  $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-
-try
-{
-  $f['title'];
-  $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-catch (LogicException $e)
-{
-  $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-
-try
-{
-  $parent['title1'];
-  $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-catch (LogicException $e)
-{
-  $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-
-// ->getValue() ->getWidget() ->getParent() ->getError() ->hasError()
@@ -92 +47 @@
-$errorSchema1 = new sfValidatorErrorSchema(new sfValidatorString());
-$errorSchema1->addError(new sfValidatorError(new sfValidatorString(), 'error'), 'title1');
-
+Schema
-$f1 = $parent1['title'];
-$t->is($f1->hasError(), false, '->hasError() returns false if the form field has no error');