Permalink
Browse files

Merge branch '2.1'

* 2.1:
  fixed CS
  added doc comments
  added doc comments
  [Validator] Updated swedish translation
  Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
  [2.1] Exclude tests from zips via gitattributes
  [HttpKernel][Translator] Fixed type-hints
  Updated lithuanian validation translation
  [DomCrawler] Allows using multiselect through Form::setValues().
  [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/translation#1)
  Unit test for patched method OptionsResolver::validateOptionValues().
  validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
  [Form] Hardened code of ViolationMapper against errors
  [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
  [Form] Fixed negative index access in PropertyPathBuilder
  Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf

Conflicts:
	src/Symfony/Component/DomCrawler/Form.php
	src/Symfony/Component/Process/Process.php
  • Loading branch information...
2 parents faa80e6 + 2bf63ba commit e05761ecbb417f6a96fcb605e40f9e502cbc06be @fabpot fabpot committed Oct 6, 2012
Showing with 210 additions and 1 deletion.
  1. +2 −0 .gitattributes
  2. +201 −1 Form.php
  3. +7 −0 Tests/FormTest.php
View
@@ -0,0 +1,2 @@
+Tests/ export-ignore
+phpunit.xml.dist export-ignore
View
202 Form.php
@@ -384,4 +384,204 @@ private function initialize()
}
}
}
-}
+}
+
+class FormFieldRegistry
+{
+ private $fields = array();
+
+ private $base;
+
+ /**
+ * Adds a field to the registry.
+ *
+ * @param FormField $field The field
+ *
+ * @throws \InvalidArgumentException when the name is malformed
+ */
+ public function add(FormField $field)
+ {
+ $segments = $this->getSegments($field->getName());
+
+ $target =& $this->fields;
+ while ($segments) {
+ if (!is_array($target)) {
+ $target = array();
+ }
+ $path = array_shift($segments);
+ if ('' === $path) {
+ $target =& $target[];
+ } else {
+ $target =& $target[$path];
+ }
+ }
+ $target = $field;
+ }
+
+ /**
+ * Removes a field and its children from the registry.
+ *
+ * @param string $name The fully qualified name of the base field
+ *
+ * @throws \InvalidArgumentException when the name is malformed
+ */
+ public function remove($name)
+ {
+ $segments = $this->getSegments($name);
+ $target =& $this->fields;
+ while (count($segments) > 1) {
+ $path = array_shift($segments);
+ if (!array_key_exists($path, $target)) {
+ return;
+ }
+ $target =& $target[$path];
+ }
+ unset($target[array_shift($segments)]);
+ }
+
+ /**
+ * Returns the value of the field and its children.
+ *
+ * @param string $name The fully qualified name of the field
+ *
+ * @return mixed The value of the field
+ *
+ * @throws \InvalidArgumentException when the name is malformed
+ * @throws \InvalidArgumentException if the field does not exist
+ */
+ public function &get($name)
+ {
+ $segments = $this->getSegments($name);
+ $target =& $this->fields;
+ while ($segments) {
+ $path = array_shift($segments);
+ if (!array_key_exists($path, $target)) {
+ throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path));
+ }
+ $target =& $target[$path];
+ }
+
+ return $target;
+ }
+
+ /**
+ * Tests whether the form has the given field.
+ *
+ * @param string $name The fully qualified name of the field
+ *
+ * @return Boolean Whether the form has the given field
+ */
+ public function has($name)
+ {
+ try {
+ $this->get($name);
+
+ return true;
+ } catch (\InvalidArgumentException $e) {
+ return false;
+ }
+ }
+
+ /**
+ * Set the value of a field and its children.
+ *
+ * @param string $name The fully qualified name of the field
+ * @param mixed $value The value
+ *
+ * @throws \InvalidArgumentException when the name is malformed
+ * @throws \InvalidArgumentException if the field does not exist
+ */
+ public function set($name, $value)
+ {
+ $target =& $this->get($name);
+ if (!is_array($value) || $target instanceof Field\ChoiceFormField) {
+ $target->setValue($value);
+ } else {
+ $fields = self::create($name, $value);
+ foreach ($fields->all() as $k => $v) {
+ $this->set($k, $v);
+ }
+ }
+ }
+
+ /**
+ * Returns the list of field with their value.
+ *
+ * @return array The list of fields as array((string) Fully qualified name => (mixed) value)
+ */
+ public function all()
+ {
+ return $this->walk($this->fields, $this->base);
+ }
+
+ /**
+ * Creates an instance of the class.
+ *
+ * This function is made private because it allows overriding the $base and
+ * the $values properties without any type checking.
+ *
+ * @param string $base The fully qualified name of the base field
+ * @param array $values The values of the fields
+ *
+ * @return FormFieldRegistry
+ */
+ private static function create($base, array $values)
+ {
+ $registry = new static();
+ $registry->base = $base;
+ $registry->fields = $values;
+
+ return $registry;
+ }
+
+ /**
+ * Transforms a PHP array in a list of fully qualified name / value.
+ *
+ * @param array $array The PHP array
+ * @param string $base The name of the base field
+ * @param array $output The initial values
+ *
+ * @return array The list of fields as array((string) Fully qualified name => (mixed) value)
+ */
+ private function walk(array $array, $base = '', array &$output = array())
+ {
+ foreach ($array as $k => $v) {
+ $path = empty($base) ? $k : sprintf("%s[%s]", $base, $k);
+ if (is_array($v)) {
+ $this->walk($v, $path, $output);
+ } else {
+ $output[$path] = $v;
+ }
+ }
+
+ return $output;
+ }
+
+ /**
+ * Splits a field name into segments as a web browser would do.
+ *
+ * <code>
+ * getSegments('base[foo][3][]') = array('base', 'foo, '3', '');
+ * </code>
+ *
+ * @param string $name The name of the field
+ *
+ * @return array The list of segments
+ *
+ * @throws \InvalidArgumentException when the name is malformed
+ */
+ private function getSegments($name)
+ {
+ if (preg_match('/^(?P<base>[^[]+)(?P<extra>(\[.*)|$)/', $name, $m)) {
+ $segments = array($m['base']);
+ while (preg_match('/^\[(?P<segment>.*?)\](?P<extra>.*)$/', $m['extra'], $m)) {
+ $segments[] = $m['segment'];
+ }
+
+ return $segments;
+ }
+
+ throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name));
+ }
+}
+>>>>>>> 2.1
View
@@ -273,6 +273,13 @@ public function testSetValues()
$this->assertEquals(array('bar' => 'foo'), $form->getValues(), '->setValues() sets the values of fields');
}
+ public function testMultiselectSetValues()
+ {
+ $form = $this->createForm('<form><select multiple="multiple" name="multi"><option value="foo">foo</option><option value="bar">bar</option></select><input type="submit" /></form>');
+ $form->setValues(array('multi' => array("foo", "bar")));
+ $this->assertEquals(array('multi' => array('foo', 'bar')), $form->getValues(), '->setValue() sets tehe values of select');
+ }
+
public function testGetPhpValues()
{
$form = $this->createForm('<form><input type="text" name="foo[bar]" value="foo" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');

2 comments on commit e05761e

Re-introduces a bug that was fixed with symfony#7 :(

Owner

fabpot replied Oct 9, 2012

@kdambekalns Sorry, it is because of a bad merge. This has been fixed now.

Please sign in to comment.