From b439d13a81c443ce3e269ffed7ed0c73bfd0f9b9 Mon Sep 17 00:00:00 2001
From: Leonid Terentyev <lt@goldenplanet.com>
Date: Mon, 8 Oct 2012 14:13:27 +0300
Subject: [PATCH]  fixed DomCrwaler/Form to handle <button> when submitted

---
 src/Symfony/Component/DomCrawler/Field/InputFormField.php | 4 ++--
 src/Symfony/Component/DomCrawler/Form.php                 | 2 +-
 tests/Symfony/Tests/Component/DomCrawler/FormTest.php     | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/Symfony/Component/DomCrawler/Field/InputFormField.php b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
index 251873cf2e..d3d3957934 100644
--- a/src/Symfony/Component/DomCrawler/Field/InputFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
@@ -30,8 +30,8 @@ class InputFormField extends FormField
      */
     protected function initialize()
     {
-        if ('input' != $this->node->nodeName) {
-            throw new \LogicException(sprintf('An InputFormField can only be created from an input tag (%s given).', $this->node->nodeName));
+        if ('input' != $this->node->nodeName && 'button' != $this->node->nodeName) {
+            throw new \LogicException(sprintf('An InputFormField can only be created from an input or button tag (%s given).', $this->node->nodeName));
         }
 
         if ('checkbox' == $this->node->getAttribute('type')) {
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index c0d322fef2..ad046c03dc 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -293,7 +293,7 @@ class Form extends Link implements \ArrayAccess
         $root->appendChild($button);
         $xpath = new \DOMXPath($document);
 
-        foreach ($xpath->query('descendant::input | descendant::textarea | descendant::select', $root) as $node) {
+        foreach ($xpath->query('descendant::input | descendant::button | descendant::textarea | descendant::select', $root) as $node) {
             if (!$node->hasAttribute('name')) {
                 continue;
             }
diff --git a/tests/Symfony/Tests/Component/DomCrawler/FormTest.php b/tests/Symfony/Tests/Component/DomCrawler/FormTest.php
index 711489213c..41e599ec66 100644
--- a/tests/Symfony/Tests/Component/DomCrawler/FormTest.php
+++ b/tests/Symfony/Tests/Component/DomCrawler/FormTest.php
@@ -83,6 +83,11 @@ class FormTest extends \PHPUnit_Framework_TestCase
                 '<input type="submit" name="bar" value="bar" />',
                 array('bar' => array('Symfony\\Component\\DomCrawler\\Field\\InputFormField', 'bar')),
             ),
+            array(
+                'appends the submitted button value for Button element',
+                '<button type="submit" name="bar" value="bar">Bar</button>',
+                array('bar' => array('Symfony\\Component\\DomCrawler\\Field\\InputFormField', 'bar')),
+            ),
             array(
                 'appends the submitted button value but not other submit buttons',
                 '<input type="submit" name="bar" value="bar" />
@@ -404,7 +409,8 @@ class FormTest extends \PHPUnit_Framework_TestCase
         $dom = new \DOMDocument();
         $dom->loadHTML('<html>'.$form.'</html>');
 
-        $nodes = $dom->getElementsByTagName('input');
+        $xPath = new \DOMXPath($dom);
+        $nodes = $xPath->query('//input | //button');
 
         if (null === $currentUri) {
             $currentUri = 'http://example.com/';
