Changeset 24217

Timestamp:

11/22/09 07:47:54 (4 years ago)

Author:

fabien

Message:

[1.3, 1.4] fixed embedded forms in functional tests (closes #7653)

Files:

• branches/1.3/lib/test/sfTesterForm.class.php (modified) (2 diffs)
• branches/1.4/lib/test/sfTesterForm.class.php (modified) (2 diffs)

branches/1.3/lib/test/sfTesterForm.class.php

@@ -132 +132 @@
-    else
-    {
-form[$field]
+getFormField($field)
-    }
-
@@ -227 +227 @@
-    return $parameters;
-  }
+
+  /**
+   * @param string $path
+   * @return sfFormField
+   */
+
+  public function getFormField($path)
+  {
+    if (false !== $pos = strpos($path, '['))
+    {
+      $field = $this->form[substr($path, 0, $pos)];
+    }
+    else
+    {
+      return $this->form[$path];
+    }
+
+    if (preg_match_all('/\[(?P<part>[^]]+)\]/', $path, $matches))
+    {
+      foreach($matches['part'] as $part)
+      {
+        $field = $field[$part];
+      }
+    }
+
+    return $field;
+  }
-}

branches/1.4/lib/test/sfTesterForm.class.php

@@ -132 +132 @@
-    else
-    {
-form[$field]
+getFormField($field)
-    }
-
@@ -227 +227 @@
-    return $parameters;
-  }
+
+  /**
+   * @param string $path
+   * @return sfFormField
+   */
+
+  public function getFormField($path)
+  {
+    if (false !== $pos = strpos($path, '['))
+    {
+      $field = $this->form[substr($path, 0, $pos)];
+    }
+    else
+    {
+      return $this->form[$path];
+    }
+
+    if (preg_match_all('/\[(?P<part>[^]]+)\]/', $path, $matches))
+    {
+      foreach($matches['part'] as $part)
+      {
+        $field = $field[$part];
+      }
+    }
+
+    return $field;
+  }
-}