bug #34059 [DomCrawler] Skip disabled fields processing in Form (sbogx)

fabpot · fabpot · commit 6c96706381e4 · 2020-02-03T11:01:18.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DomCrawler] Skip disabled fields processing in Form | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #28179 | License | MIT Commits ------- c73b042 bug #28179 [DomCrawler] Skip disabled fields processing in Form
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
@@ -89,10 +89,6 @@ public function getValues()
     {
         $values = [];
         foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
             if (!$field instanceof Field\FileFormField && $field->hasValue()) {
                 $values[$name] = $field->getValue();
             }
@@ -115,10 +111,6 @@ public function getFiles()
         $files = [];
 
         foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
             if ($field instanceof Field\FileFormField) {
                 $files[$name] = $field->getValue();
             }
@@ -463,7 +455,7 @@ private function initialize()
 
     private function addField(\DOMElement $node)
     {
-        if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
+        if (!$node->hasAttribute('name') || !$node->getAttribute('name') || $node->hasAttribute('disabled')) {
             return;
         }
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -158,12 +158,12 @@ public function testConstructorHandlesFormValues()
     public function testMultiValuedFields()
     {
         $form = $this->createForm('<form>
-            <input type="text" name="foo[4]" value="foo" disabled="disabled" />
-            <input type="text" name="foo" value="foo" disabled="disabled" />
-            <input type="text" name="foo[2]" value="foo" disabled="disabled" />
-            <input type="text" name="foo[]" value="foo" disabled="disabled" />
-            <input type="text" name="bar[foo][]" value="foo" disabled="disabled" />
-            <input type="text" name="bar[foo][foobar]" value="foo" disabled="disabled" />
+            <input type="text" name="foo[4]" value="foo" />
+            <input type="text" name="foo" value="foo" />
+            <input type="text" name="foo[2]" value="foo" />
+            <input type="text" name="foo[]" value="foo" />
+            <input type="text" name="bar[foo][]" value="foo" />
+            <input type="text" name="bar[foo][foobar]" value="foo" />
             <input type="submit" />
         </form>
         ');
@@ -226,10 +226,10 @@ public function provideInitializeValues()
                 [],
             ],
             [
-                'takes into account disabled input fields',
+                'skips disabled input fields',
                 '<input type="text" name="foo" value="foo" disabled="disabled" />
                  <input type="submit" />',
-                ['foo' => ['InputFormField', 'foo']],
+                [],
             ],
             [
                 'appends the submitted button value',

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,6 @@ public function getValues()`
`89`	`89`	`{`
`90`	`90`	`$values = [];`
`91`	`91`	`foreach ($this->fields->all() as $name => $field) {`
`92`		`- if ($field->isDisabled()) {`
`93`		`- continue;`
`94`		`- }`
`95`		`-`
`96`	`92`	`if (!$field instanceof Field\FileFormField && $field->hasValue()) {`
`97`	`93`	`$values[$name] = $field->getValue();`
`98`	`94`	`}`
`@@ -115,10 +111,6 @@ public function getFiles()`
`115`	`111`	`$files = [];`
`116`	`112`
`117`	`113`	`foreach ($this->fields->all() as $name => $field) {`
`118`		`- if ($field->isDisabled()) {`
`119`		`- continue;`
`120`		`- }`
`121`		`-`
`122`	`114`	`if ($field instanceof Field\FileFormField) {`
`123`	`115`	`$files[$name] = $field->getValue();`
`124`	`116`	`}`
`@@ -463,7 +455,7 @@ private function initialize()`
`463`	`455`
`464`	`456`	`private function addField(\DOMElement $node)`
`465`	`457`	`{`
`466`		`- if (!$node->hasAttribute('name') \|\| !$node->getAttribute('name')) {`
	`458`	`+ if (!$node->hasAttribute('name') \|\| !$node->getAttribute('name') \|\| $node->hasAttribute('disabled')) {`
`467`	`459`	`return;`
`468`	`460`	`}`
`469`	`461`