[DomCrawler] Allow to add choices to single select

norkunas · norkunas · commit a23a708e5e33 · 2024-01-17T12:21:05.000+02:00
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Allow to add choices to single select
+
 7.0
 ---
 
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -143,14 +143,14 @@ public function setValue(string|array|bool|null $value): void
      */
     public function addChoice(\DOMElement $node): void
     {
-        if (!$this->multiple && 'radio' !== $this->type) {
+        if (!$this->multiple && ('radio' !== $this->type && 'select' !== $this->type)) {
             throw new \LogicException(sprintf('Unable to add a choice for "%s" as it is not multiple or is not a radio button.', $this->name));
         }
 
         $option = $this->buildOptionValue($node);
         $this->options[] = $option;
 
-        if ($node->hasAttribute('checked')) {
+        if ($node->hasAttribute('checked') || $node->hasAttribute('selected')) {
             $this->value = $option['value'];
         }
     }
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
@@ -110,6 +110,18 @@ public function testSelects()
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->setValue() throws an \InvalidArgumentException if the value is an array');
         }
+
+        $option = $this->createNode('option', 'Hello World', ['value' => 'hello_world']);
+        $field->addChoice($option);
+
+        $this->assertNotSame('hello_world', $field->getValue());
+        $field->setValue('hello_world');
+        $this->assertSame('hello_world', $field->getValue(), '->setValue() changes the selected option to dynamically added one');
+
+        $option = $this->createNode('option', 'Mr. Robot', ['value' => 'mr_robot', 'selected' => true]);
+        $field->addChoice($option);
+
+        $this->assertSame('mr_robot', $field->getValue(), '->addChoice() changes the value to added choice if selected attribute is set');
     }
 
     public function testSelectWithEmptyBooleanAttribute()

Original file line number	Diff line number	Diff line change
`@@ -143,14 +143,14 @@ public function setValue(string\|array\|bool\|null $value): void`
`143`	`143`	`*/`
`144`	`144`	`public function addChoice(\DOMElement $node): void`
`145`	`145`	`{`
`146`		`- if (!$this->multiple && 'radio' !== $this->type) {`
	`146`	`+ if (!$this->multiple && ('radio' !== $this->type && 'select' !== $this->type)) {`
`147`	`147`	`throw new \LogicException(sprintf('Unable to add a choice for "%s" as it is not multiple or is not a radio button.', $this->name));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`$option = $this->buildOptionValue($node);`
`151`	`151`	`$this->options[] = $option;`
`152`	`152`
`153`		`- if ($node->hasAttribute('checked')) {`
	`153`	`+ if ($node->hasAttribute('checked') \|\| $node->hasAttribute('selected')) {`
`154`	`154`	`$this->value = $option['value'];`
`155`	`155`	`}`
`156`	`156`	`}`