Fix Dom Crawler select option with empty value

Matt Wells · Matt Wells · commit 58276a274e2e · 2016-04-06T14:13:46.000+01:00
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -259,7 +259,8 @@ private function buildOptionValue($node)
     {
         $option = array();
 
-        $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : '1';
+        $defaultDefaultValue = 'select' === $this->node->nodeName ? '' : '1';
+        $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : $defaultDefaultValue;
         $option['value'] = $node->hasAttribute('value') ? $node->getAttribute('value') : $defaultValue;
         $option['disabled'] = $node->hasAttribute('disabled');
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
@@ -336,6 +336,14 @@ public function testOptionWithNoValue()
         $this->assertEquals('foo', $field->getValue(), '->select() changes the selected option');
     }
 
+    public function testSelectWithEmptyValue()
+    {
+        $node = $this->createSelectNodeWithEmptyOption(array('' => true, 'Female' => false, 'Male' => false));
+        $field = new ChoiceFormField($node);
+
+        $this->assertSame('', $field->getValue());
+    }
+
     protected function createSelectNode($options, $attributes = array(), $selectedAttrText = 'selected')
     {
         $document = new \DOMDocument();

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,8 @@ private function buildOptionValue($node)`
`259`	`259`	`{`
`260`	`260`	`$option = array();`
`261`	`261`
`262`		`- $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : '1';`
	`262`	`+ $defaultDefaultValue = 'select' === $this->node->nodeName ? '' : '1';`
	`263`	`+ $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : $defaultDefaultValue;`
`263`	`264`	`$option['value'] = $node->hasAttribute('value') ? $node->getAttribute('value') : $defaultValue;`
`264`	`265`	`$option['disabled'] = $node->hasAttribute('disabled');`
`265`	`266`
Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,14 @@ public function testOptionWithNoValue()`
`336`	`336`	`$this->assertEquals('foo', $field->getValue(), '->select() changes the selected option');`
`337`	`337`	`}`
`338`	`338`
	`339`	`+ public function testSelectWithEmptyValue()`
	`340`	`+ {`
	`341`	`+ $node = $this->createSelectNodeWithEmptyOption(array('' => true, 'Female' => false, 'Male' => false));`
	`342`	`+ $field = new ChoiceFormField($node);`
	`343`	`+`
	`344`	`+ $this->assertSame('', $field->getValue());`
	`345`	`+ }`
	`346`	`+`
`339`	`347`	`protected function createSelectNode($options, $attributes = array(), $selectedAttrText = 'selected')`
`340`	`348`	`{`
`341`	`349`	`$document = new \DOMDocument();`