symfony
diff --git a/‎src/Symfony/Component/DomCrawler/Form.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Form.php
+4-3Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Component/DomCrawler/Form.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Form.php
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Symfony/Component/DomCrawler/Tests/FormTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/FormTest.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/DomCrawler/Tests/FormTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/FormTest.php
+7Lines changed: 7 additions & 0 deletions
@@ -494,13 +494,14 @@ public function has($name)
     public function set($name, $value)
     {
         $target =& $this->get($name);
-        if (is_array($value)) {
+        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);
             }
-        } else {
-            $target->setValue($value);
         }
     }
 
 
@@ -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>');
Original file line number	Diff line number	Diff line change
`@@ -494,13 +494,14 @@ public function has($name)`
`494`	`494`	`public function set($name, $value)`
`495`	`495`	`{`
`496`	`496`	`$target =& $this->get($name);`
`497`		`- if (is_array($value)) {`
	`497`	`+ if (!is_array($value) \|\| $target instanceof Field\ChoiceFormField) {`
	`498`	`+ $target->setValue($value);`
	`499`	`+ }`
	`500`	`+ else {`
`498`	`501`	`$fields = self::create($name, $value);`
`499`	`502`	`foreach ($fields->all() as $k => $v) {`
`500`	`503`	`$this->set($k, $v);`
`501`	`504`	`}`
`502`		`- } else {`
`503`		`- $target->setValue($value);`
`504`	`505`	`}`
`505`	`506`	`}`
`506`	`507`
Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,13 @@ public function testSetValues()`
`273`	`273`	`$this->assertEquals(array('bar' => 'foo'), $form->getValues(), '->setValues() sets the values of fields');`
`274`	`274`	`}`
`275`	`275`
	`276`	`+ public function testMultiselectSetValues()`
	`277`	`+ {`
	`278`	`+ $form = $this->createForm('<form><select multiple="multiple" name="multi"><option value="foo">foo</option><option value="bar">bar</option></select><input type="submit" /></form>');`
	`279`	`+ $form->setValues(array('multi' => array("foo", "bar")));`
	`280`	`+ $this->assertEquals(array('multi' => array('foo', 'bar')), $form->getValues(), '->setValue() sets tehe values of select');`
	`281`	`+ }`
	`282`	`+`
`276`	`283`	`public function testGetPhpValues()`
`277`	`284`	`{`
`278`	`285`	`$form = $this->createForm('<form><input type="text" name="foo[bar]" value="foo" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');`