merged branch bierdok/master (PR #6015)

fabpot · fabpot · commit c34f7731a081 · 2012-11-19T13:42:23.000+01:00
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #6015). Commits ------- f61c019 Update src/Symfony/Component/DomCrawler/Tests/FormTest.php 9b3aaf2 Update src/Symfony/Component/DomCrawler/Form.php Discussion ---------- FIX: Malformed field path "" In case we have the name attribute empty. --------------------------------------------------------------------------- by fabpot at 2012-11-15T06:12:35Z Can you add a unit test for that case? --------------------------------------------------------------------------- by bierdok at 2012-11-15T09:21:01Z Voila.
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
@@ -294,7 +294,7 @@ private function initialize()
         $xpath = new \DOMXPath($document);
 
         foreach ($xpath->query('descendant::input | descendant::button | descendant::textarea | descendant::select', $root) as $node) {
-            if (!$node->hasAttribute('name')) {
+            if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
                 continue;
             }
 
diff --git a/tests/Symfony/Tests/Component/DomCrawler/FormTest.php b/tests/Symfony/Tests/Component/DomCrawler/FormTest.php
@@ -72,6 +72,12 @@ public function provideInitializeValues()
                  <input type="submit" />',
                 array(),
             ),
+            array(
+                'does not take into account input fields with an empty name attribute value',
+                '<input type="text" name="" value="foo" />
+                 <input type="submit" />',
+                array(),
+            ),
             array(
                 'takes into account disabled input fields',
                 '<input type="text" name="foo" value="foo" disabled="disabled" />

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ private function initialize()`
`294`	`294`	`$xpath = new \DOMXPath($document);`
`295`	`295`
`296`	`296`	`foreach ($xpath->query('descendant::input \| descendant::button \| descendant::textarea \| descendant::select', $root) as $node) {`
`297`		`- if (!$node->hasAttribute('name')) {`
	`297`	`+ if (!$node->hasAttribute('name') \|\| !$node->getAttribute('name')) {`
`298`	`298`	`continue;`
`299`	`299`	`}`
`300`	`300`