bug #35937 Revert "bug #28179 [DomCrawler] Skip disabled fields processing in Form" (dmaicher)

fabpot · fabpot · commit 3a8da96b74ea · 2020-03-03T14:53:42.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Revert "bug #28179 [DomCrawler] Skip disabled fields processing in Form" | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #35923 | License | MIT | Doc PR | - Reverts #34059 See #35923 Commits ------- af17f5a Revert "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,6 +89,10 @@ 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();
             }
@@ -111,6 +115,10 @@ public function getFiles()
         $files = [];
 
         foreach ($this->fields->all() as $name => $field) {
+            if ($field->isDisabled()) {
+                continue;
+            }
+
             if ($field instanceof Field\FileFormField) {
                 $files[$name] = $field->getValue();
             }
@@ -455,7 +463,7 @@ private function initialize()
 
     private function addField(\DOMElement $node)
     {
-        if (!$node->hasAttribute('name') || !$node->getAttribute('name') || $node->hasAttribute('disabled')) {
+        if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
             return;
         }
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -159,12 +159,12 @@ public function testConstructorHandlesFormValues()
     public function testMultiValuedFields()
     {
         $form = $this->createForm('<form>
-            <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="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="submit" />
         </form>
         ');
@@ -227,10 +227,10 @@ public function provideInitializeValues()
                 [],
             ],
             [
-                'skips disabled input fields',
+                'takes into account 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,6 +89,10 @@ 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`	`+`
`92`	`96`	`if (!$field instanceof Field\FileFormField && $field->hasValue()) {`
`93`	`97`	`$values[$name] = $field->getValue();`
`94`	`98`	`}`
`@@ -111,6 +115,10 @@ public function getFiles()`
`111`	`115`	`$files = [];`
`112`	`116`
`113`	`117`	`foreach ($this->fields->all() as $name => $field) {`
	`118`	`+ if ($field->isDisabled()) {`
	`119`	`+ continue;`
	`120`	`+ }`
	`121`	`+`
`114`	`122`	`if ($field instanceof Field\FileFormField) {`
`115`	`123`	`$files[$name] = $field->getValue();`
`116`	`124`	`}`
`@@ -455,7 +463,7 @@ private function initialize()`
`455`	`463`
`456`	`464`	`private function addField(\DOMElement $node)`
`457`	`465`	`{`
`458`		`- if (!$node->hasAttribute('name') \|\| !$node->getAttribute('name') \|\| $node->hasAttribute('disabled')) {`
	`466`	`+ if (!$node->hasAttribute('name') \|\| !$node->getAttribute('name')) {`
`459`	`467`	`return;`
`460`	`468`	`}`
`461`	`469`