Changeset 13060

Timestamp:

11/17/08 12:52:11 (1 year ago)

Author:

fabien

Message:

[1.2] added a sfForm::getName() method (closes #4852)

Files:

• branches/1.2/lib/form/sfForm.class.php (modified) (1 diff)
• branches/1.2/lib/generator/sfAdminGenerator.class.php (modified) (1 diff)
• branches/1.2/lib/generator/sfModelGenerator.class.php (modified) (1 diff)
• branches/1.2/test/unit/form/sfFormTest.php (modified) (2 diffs)

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

@@ -329 +329 @@
-
-  /**
+   * Returns the array name under which user data can retrieved.
+   *
+   * If the user data is not stored under an array, it returns null.
+   *
+   * @return string The name
+   */
+  public function getName()
+  {
+    if ('%s' == $nameFormat = $this->widgetSchema->getNameFormat())
+    {
+      return false;
+    }
+
+    return str_replace('[%s]', '', $nameFormat);
+  }
+
+  /**
-   * Gets the error schema associated with the form.
-   *

branches/1.2/lib/generator/sfAdminGenerator.class.php

@@ -739 +739 @@
-  }
-
-  public function getFormParameterName()
-  {
-    return str_replace('[%s]', '', $this->getFormObject()->getWidgetSchema()->getNameFormat());
-  }
-
-  /**
-   * Retrieves all hidden fields in the widget schema

branches/1.2/lib/generator/sfModelGenerator.class.php

@@ -322 +322 @@
-
-  /**
-   * Gets the form parameter name.
-   *
-   * @param string The form parameter name
-   */
-  public function getFormParameterName()
-  {
-    return str_replace('[%s]', '', $this->getFormObject()->getWidgetSchema()->getNameFormat());
-  }
-
-  /**
-   * Gets the HTML to add to the form tag if the form is multipart.
-   *

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-29
+31
-
-class FormTest extends sfForm
@@ -70 +70 @@
-$t->is($f->getDefault('_csrf_token'), $f->getCSRFToken('*mygreatsecret*'), '->getDefaults() keeps the CSRF token default value');
-sfForm::disableCSRFProtection();
+
+// ->getName()
+$t->diag('->getName()');
+$f = new FormTest();
+$w = new sfWidgetFormSchema();
+$f->setWidgetSchema($w);
+$t->is($f->getName(), null, '->getName() returns null if the name format is not an array');
+$w->setNameFormat('foo[%s]');
+$t->is($f->getName(), 'foo', '->getName() returns the name under which user data can be retrieved');
-
-// ::enableCSRFProtection() ::disableCSRFProtection() ->isCSRFProtected()