deprecate using invalid names for buttons

xabbuh · xabbuh · commit 21c1170fdb07 · 2018-10-24T16:24:12.000+02:00
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -55,6 +55,12 @@ Finder
 Form
 ----
 
+ * Using names for buttons that do not start with a letter, a digit, or an underscore is deprecated and will lead to an
+   exception in 5.0.
+
+ * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons is deprecated and
+   will lead to an exception in 5.0.
+
  * The `getExtendedType()` method of the `FormTypeExtensionInterface` is deprecated and will be removed in 5.0. Type
    extensions must implement the static `getExtendedTypes()` method instead and return an iterable of extended types.
 
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -72,6 +72,11 @@ Finder
 Form
 ----
 
+ * Using names for buttons that do not start with a letter, a digit, or an underscore leads to an exception.
+
+ * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons leads to an
+   exception.
+
  * The `getExtendedType()` method was removed from the `FormTypeExtensionInterface`. It is replaced by the the static
    `getExtendedTypes()` method which must return an iterable of extended types.
 
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -63,6 +63,17 @@ public function __construct(?string $name, array $options = array())
 
         $this->name = $name;
         $this->options = $options;
+
+        if (!preg_match('/^[a-z0-9_]$/', $name[0])) {
+            @trigger_error(sprintf('Using names for buttons that do not start with a letter, a digit, or an underscore is deprecated since Symfony 4.2 and will trigger an exception in 5.0 ("%s" given).', $name), E_USER_DEPRECATED);
+        }
+
+        if (!preg_match('/^[a-zA-Z0-9_][a-zA-Z0-9_\-:]*$/D', $name)) {
+            @trigger_error(sprintf('Using names for buttons that do not contain only letters, digits, underscores ("_"), hyphens ("-") and colons (":") ("%s" given) is deprecated since Symfony 4.2 and will trigger an exception in 5.0.', $name), E_USER_DEPRECATED);
+        }
+
+        // to be added in 5.0
+        // FormConfigBuilder::validateName($name);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,12 @@ CHANGELOG
 4.2.0
 -----
 
+ * Using names for buttons that do not start with a letter, a digit, or an underscore is deprecated and will lead to an
+   exception in 5.0.
+
+ * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons is deprecated and
+   will lead to an exception in 5.0.
+
  * The `getExtendedType()` method of the `FormTypeExtensionInterface` is deprecated and will be removed in 5.0. Type
    extensions must implement the static `getExtendedTypes()` method instead and return an iterable of extended types.
 
diff --git a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
@@ -28,7 +28,6 @@ public function getValidNames()
             array('foo'),
             array('0'),
             array(0),
-            array('button[]'),
         );
     }
 
@@ -40,6 +39,14 @@ public function testValidNames($name)
         $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder($name));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testNameContainingSquareBrackets()
+    {
+        $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder('button[]'));
+    }
+
     public function getInvalidNames()
     {
         return array(
