Merge branch '4.3' into 4.4

* 4.3: allow button names to start with uppercase letter
symfony · Nov 19, 2019 · 12f00e3e15ffc0fdf84651b305e60d77f58c2df7 · 12f00e3
2 parents bf8e444 + a7c66db
commit 12f00e3e15ffc0fdf84651b305e60d77f58c2df7
Unified Split

Showing with 4 additions and 12 deletions.

+1 −1 UPGRADE-4.3.md

+1 −1 UPGRADE-5.0.md

+1 −1 src/Symfony/Component/Form/ButtonBuilder.php

+1 −1 src/Symfony/Component/Form/CHANGELOG.md

+0 −8 src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
diff --git a/UPGRADE-4.3.md b/UPGRADE-4.3.md
@@ -96,7 +96,7 @@ Form
 ----
 
  * Using the `format` option of `DateType` and `DateTimeType` when the `html5` option is enabled is deprecated.
- * Using names for buttons that do not start with a lowercase letter, a digit, or an underscore is deprecated and will lead to an
+ * 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.

diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -142,7 +142,7 @@ Form
    without configuring a reference date.
  * Removed support for using `int` or `float` as data for the `NumberType` when the `input` option is set to `string`.
  * Removed support for using the `format` option of `DateType` and `DateTimeType` when the `html5` option is enabled.
- * Using names for buttons that do not start with a lowercase letter, a digit, or an underscore leads to an exception.
+ * 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.
  * Using the `date_format`, `date_widget`, and `time_widget` options of the `DateTimeType` when the `widget` option is

diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -61,7 +61,7 @@ public function __construct(?string $name, array $options = [])
         $this->name = $name;
         $this->options = $options;
 
-        if (preg_match('/^([^a-z0-9_].*)?(.*[^a-zA-Z0-9_\-:].*)?$/D', $name, $matches)) {
+        if (preg_match('/^([^a-zA-Z0-9_].*)?(.*[^a-zA-Z0-9_\-:].*)?$/D', $name, $matches)) {
             if (isset($matches[1])) {
                 @trigger_error(sprintf('Using names for buttons that do not start with a lowercase letter, a digit, or an underscore is deprecated since Symfony 4.3 and will throw an exception in 5.0 ("%s" given).', $name), E_USER_DEPRECATED);
             }

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -20,7 +20,7 @@ CHANGELOG
 
  * added a `symbol` option to the `PercentType` that allows to disable or customize the output of the percent character
  * Using the `format` option of `DateType` and `DateTimeType` when the `html5` option is enabled is deprecated.
- * Using names for buttons that do not start with a lowercase letter, a digit, or an underscore is deprecated and will lead to an
+ * 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.

diff --git a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
@@ -47,14 +47,6 @@ public function testNameContainingIllegalCharacters()
         $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder('button[]'));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testNameStartingWithIllegalCharacters()
-    {
-        $this->assertInstanceOf('\Symfony\Component\Form\ButtonBuilder', new ButtonBuilder('Button'));
-    }
-
     public function getInvalidNames()
     {
         return [