diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index fc0927f8ac..5b361982fd 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -433,14 +433,14 @@ class Form extends Link implements \ArrayAccess
// corresponding elements are either descendants or have a matching HTML5 form attribute
$formId = Crawler::xpathLiteral($this->node->getAttribute('id'));
- $fieldNodes = $xpath->query(sprintf('descendant::input[@form=%s] | descendant::button[@form=%1$s] | descendant::textarea[@form=%1$s] | descendant::select[@form=%1$s] | //form[@id=%1$s]//input[not(@form)] | //form[@id=%1$s]//button[not(@form)] | //form[@id=%1$s]//textarea[not(@form)] | //form[@id=%1$s]//select[not(@form)]', $formId));
+ $fieldNodes = $xpath->query(sprintf('( descendant::input[@form=%s] | descendant::button[@form=%1$s] | descendant::textarea[@form=%1$s] | descendant::select[@form=%1$s] | //form[@id=%1$s]//input[not(@form)] | //form[@id=%1$s]//button[not(@form)] | //form[@id=%1$s]//textarea[not(@form)] | //form[@id=%1$s]//select[not(@form)] )[not(ancestor::template)]', $formId));
foreach ($fieldNodes as $node) {
$this->addField($node);
}
} else {
// do the xpath query with $this->node as the context node, to only find descendant elements
// however, descendant elements with form attribute are not part of this form
- $fieldNodes = $xpath->query('descendant::input[not(@form)] | descendant::button[not(@form)] | descendant::textarea[not(@form)] | descendant::select[not(@form)]', $this->node);
+ $fieldNodes = $xpath->query('( descendant::input[not(@form)] | descendant::button[not(@form)] | descendant::textarea[not(@form)] | descendant::select[not(@form)] )[not(ancestor::template)]', $this->node);
foreach ($fieldNodes as $node) {
$this->addField($node);
}
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
index 02d2ebe593..7e259de196 100644
--- a/src/Symfony/Component/DomCrawler/Tests/FormTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -394,6 +394,10 @@ class FormTest extends TestCase
$form = $this->createForm('');
$this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include disabled fields');
+
+ $form = $this->createForm('');
+ $this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include template fields');
+ $this->assertFalse($form->has('foo'));
}
public function testSetValues()
@@ -444,6 +448,10 @@ class FormTest extends TestCase
$form = $this->createForm('');
$this->assertEquals(array(), $form->getFiles(), '->getFiles() does not include disabled file fields');
+
+ $form = $this->createForm('');
+ $this->assertEquals(array(), $form->getFiles(), '->getFiles() does not include template file fields');
+ $this->assertFalse($form->has('foo'));
}
public function testGetPhpFiles()
@@ -857,7 +865,7 @@ class FormTest extends TestCase
protected function createForm($form, $method = null, $currentUri = null)
{
$dom = new \DOMDocument();
- $dom->loadHTML(''.$form.'');
+ @$dom->loadHTML(''.$form.'');
$xPath = new \DOMXPath($dom);
$nodes = $xPath->query('//input | //button');