symfony
diff --git a/‎src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
+8Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
+8Lines changed: 8 additions & 0 deletions
@@ -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;
 
@@ -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'));