[DomCrawler] Add tests for recursive cases of getPhpValues() and getPhpFiles()

romainneutron · romainneutron · commit 89c599e5b70d · 2014-03-13T17:35:57.000+01:00
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
@@ -408,8 +408,7 @@ private function initialize()
 
                 // restore the original name of the input node
                 $this->button->setAttribute('name', $name);
-            }
-            else {
+            } else {
                 $this->set(new Field\InputFormField($document->importNode($this->button, true)));
             }
         }
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -394,6 +394,9 @@ public function testGetPhpValues()
 
         $form = $this->createForm('<form><input type="text" name="fo.o[ba.r]" value="foo" /><input type="text" name="ba r" value="bar" /><input type="submit" /></form>');
         $this->assertEquals(array('fo.o' => array('ba.r' => 'foo'), 'ba r' => 'bar'), $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names');
+
+        $form = $this->createForm('<form><input type="text" name="fo.o[ba.r][]" value="foo" /><input type="text" name="fo.o[ba.r][ba.z]" value="bar" /><input type="submit" /></form>');
+        $this->assertEquals(array('fo.o' => array('ba.r' => array('foo', 'ba.z' => 'bar'))), $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names recursively');
     }
 
     public function testGetFiles()
@@ -424,6 +427,9 @@ public function testGetPhpFiles()
 
         $form = $this->createForm('<form method="post"><input type="file" name="f.o o[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
         $this->assertEquals(array('f.o o' => array('bar' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))), $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names');
+
+        $form = $this->createForm('<form method="post"><input type="file" name="f.o o[bar][ba.z]" /><input type="file" name="f.o o[bar][]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
+        $this->assertEquals(array('f.o o' => array('bar' => array('ba.z' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0), array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)))), $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names recursively');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -408,8 +408,7 @@ private function initialize()`
`408`	`408`
`409`	`409`	`// restore the original name of the input node`
`410`	`410`	`$this->button->setAttribute('name', $name);`
`411`		`- }`
`412`		`- else {`
	`411`	`+ } else {`
`413`	`412`	`$this->set(new Field\InputFormField($document->importNode($this->button, true)));`
`414`	`413`	`}`
`415`	`414`	`}`