bug #10140 allow the TextAreaFormField to be used with valid/invalid HTML (dawehner)

fabpot · fabpot · commit 545a21870e77 · 2014-01-26T22:32:17.000+01:00
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10140). Discussion ---------- allow the TextAreaFormField to be used with valid/invalid HTML The TextAreaFormField previously used saveXML to get a representation of the child nodes of an textarea. This works pretty fine on simple text is causes issues in case you have broken HTML, as saveXML will potentially also break encoding/change the structure. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT Commits ------- 157a9de allow the TextAreaFormField to be used with valid/invalid HTML
diff --git a/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php b/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
@@ -33,7 +33,7 @@ protected function initialize()
 
         $this->value = null;
         foreach ($this->node->childNodes as $node) {
-            $this->value .= $this->document->saveXML($node);
+            $this->value .= $node->wholeText;
         }
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/TextareaFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/TextareaFormFieldTest.php
@@ -29,5 +29,19 @@ public function testInitialize()
         } catch (\LogicException $e) {
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is not a textarea');
         }
+
+        // Ensure that valid HTML can be used on a textarea.
+        $node = $this->createNode('textarea', 'foo bar <h1>Baz</h1>');
+        $field = new TextareaFormField($node);
+
+        $this->assertEquals('foo bar <h1>Baz</h1>', $field->getValue(), '->initialize() sets the value of the field to the textarea node value');
+
+        // Ensure that we don't do any DOM manipulation/validation by passing in
+        // "invalid" HTML.
+        $node = $this->createNode('textarea', 'foo bar <h1>Baz</h2>');
+        $field = new TextareaFormField($node);
+
+        $this->assertEquals('foo bar <h1>Baz</h2>', $field->getValue(), '->initialize() sets the value of the field to the textarea node value');
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function initialize()`
`33`	`33`
`34`	`34`	`$this->value = null;`
`35`	`35`	`foreach ($this->node->childNodes as $node) {`
`36`		`- $this->value .= $this->document->saveXML($node);`
	`36`	`+ $this->value .= $node->wholeText;`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`