bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)

fabpot · fabpot · commit d0cac399324a · 2016-02-26T06:48:23.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17542). Discussion ---------- ChoiceFormField of type "select" could be "disabled" Hi, New PR to add tests from the closed PR #15952 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 576c4b9 ChoiceFormField of type "select" could be "disabled"
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -55,6 +55,10 @@ public function hasValue()
      */
     public function isDisabled()
     {
+        if (parent::isDisabled() && 'select' === $this->type) {
+            return true;
+        }
+
         foreach ($this->options as $option) {
             if ($option['value'] == $this->value && $option['disabled']) {
                 return true;
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
@@ -120,6 +120,14 @@ public function testSelectWithEmptyBooleanAttribute()
         $this->assertEquals('bar', $field->getValue());
     }
 
+    public function testSelectIsDisabled()
+    {
+        $node = $this->createSelectNode(array('foo' => false, 'bar' => true), array('disabled' => 'disabled'));
+        $field = new ChoiceFormField($node);
+
+        $this->assertTrue($field->isDisabled(), '->isDisabled() returns true for selects with a disabled attribute');
+    }
+
     public function testMultipleSelects()
     {
         $node = $this->createSelectNode(array('foo' => false, 'bar' => false), array('multiple' => 'multiple'));

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,14 @@ public function testSelectWithEmptyBooleanAttribute()`
`120`	`120`	`$this->assertEquals('bar', $field->getValue());`
`121`	`121`	`}`
`122`	`122`
	`123`	`+ public function testSelectIsDisabled()`
	`124`	`+ {`
	`125`	`+ $node = $this->createSelectNode(array('foo' => false, 'bar' => true), array('disabled' => 'disabled'));`
	`126`	`+ $field = new ChoiceFormField($node);`
	`127`	`+`
	`128`	`+ $this->assertTrue($field->isDisabled(), '->isDisabled() returns true for selects with a disabled attribute');`
	`129`	`+ }`
	`130`	`+`
`123`	`131`	`public function testMultipleSelects()`
`124`	`132`	`{`
`125`	`133`	`$node = $this->createSelectNode(array('foo' => false, 'bar' => false), array('multiple' => 'multiple'));`