[Form] fixed bug - name in ButtonBuilder

cheprasov · fabpot · commit f507023e50c7 · 2016-07-08T08:48:27.000+02:00
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -62,11 +62,12 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
      */
     public function __construct($name, array $options = array())
     {
-        if (empty($name) && 0 != $name) {
+        $name = (string) $name;
+        if ('' === $name) {
             throw new InvalidArgumentException('Buttons cannot have empty names.');
         }
 
-        $this->name = (string) $name;
+        $this->name = $name;
         $this->options = $options;
     }
 
diff --git a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests;
+
+use Symfony\Component\Form\ButtonBuilder;
+
+/**
+ * @author Alexander Cheprasov <cheprasov.84@ya.ru>
+ */
+class ButtonBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    public function getValidNames()
+    {
+        return array(
+            array('reset'),
+            array('submit'),
+            array('foo'),
+            array('0'),
+            array(0),
+            array('button[]'),
+        );
+    }
+
+    /**
+     * @dataProvider getValidNames
+     */
+    public function testValidNames($name)
+    {
+        $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder($name));
+    }
+
+    public function getInvalidNames()
+    {
+        return array(
+            array(''),
+            array(false),
+            array(null),
+        );
+    }
+
+    /**
+     * @dataProvider getInvalidNames
+     */
+    public function testInvalidNames($name)
+    {
+        $this->setExpectedException(
+            '\Symfony\Component\Form\Exception\InvalidArgumentException',
+            'Buttons cannot have empty names.'
+        );
+        new ButtonBuilder($name);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,12 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface`
`62`	`62`	`*/`
`63`	`63`	`public function __construct($name, array $options = array())`
`64`	`64`	`{`
`65`		`- if (empty($name) && 0 != $name) {`
	`65`	`+ $name = (string) $name;`
	`66`	`+ if ('' === $name) {`
`66`	`67`	`throw new InvalidArgumentException('Buttons cannot have empty names.');`
`67`	`68`	`}`
`68`	`69`
`69`		`- $this->name = (string) $name;`
	`70`	`+ $this->name = $name;`
`70`	`71`	`$this->options = $options;`
`71`	`72`	`}`
`72`	`73`