bugfix in Form ButtonBuilder + test

symfony · cheprasov · Jul 6, 2016 · Jul 7, 2016 · Jul 6, 2016 · 0619e08a25efa19f98a4e5351ed5afc4c4f2708a
commit 0619e08a25efa19f98a4e5351ed5afc4c4f2708a
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,71 @@
+<?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
+{
+    /**
+     * @return array
+     */
+    public function getValidNames()
+    {
+        return array(
+            array('reset'),
+            array('submit'),
+            array('foo'),
+            array('0'),
+            array(0),
+            array('button[]'),
+        );
+    }
+
+    /**
+     * @dataProvider getValidNames
+     *
+     * @param string $name
+     */
+    public function testValidNames($name)
+    {
+        $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder($name));
+    }
+
+    /**
+     * @return array
+     */
+    public function getInvalidNames()
+    {
+        return array(
+            array(''),
+            array(false),
+            array(null),
+        );
+    }
+
+    /**
+     * @dataProvider getInvalidNames
+     *
+     * @param string $name
+     */
+    public function testInvalidNames($name)
+    {
+        $this->setExpectedException(
+            '\Symfony\Component\Form\Exception\InvalidArgumentException',
+            'Buttons cannot have empty names.'
+        );
+        new ButtonBuilder($name);
+    }
+}