minor #31705 [Form] Throw exception for invalid form buttons name (yceruto)

nicolas-grekas · nicolas-grekas · commit abc652cc0c76 · 2019-05-29T21:14:39.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [Form] Throw exception for invalid form buttons name | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - See #28969 Commits ------- 6deeaa4 Validating form buttons name
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -61,17 +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 (isset($matches[1])) {
-                @trigger_error(sprintf('Using names for buttons that do not start with a 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);
-            }
-            if (isset($matches[2])) {
-                @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.3 and will throw an exception in 5.0.', $name), E_USER_DEPRECATED);
-            }
-        }
-
-        // to be added in 5.0
-        // FormConfigBuilder::validateName($name);
+        FormConfigBuilder::validateName($name);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 5.0.0
 -----
 
+ * Using names for buttons that do not start with a letter, a digit, or an underscore throw an exception
+ * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons throw an exception.
  * removed the `ChoiceLoaderInterface` implementation in `CountryType`, `LanguageType`, `LocaleType` and `CurrencyType`
  * removed `getExtendedType()` method of the `FormTypeExtensionInterface`
  * added static `getExtendedTypes()` method to the `FormTypeExtensionInterface`
diff --git a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
@@ -40,7 +40,8 @@ public function testValidNames($name)
     }
 
     /**
-     * @group legacy
+     * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The name "button[]" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").
      */
     public function testNameContainingIllegalCharacters()
     {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ public function testValidNames($name)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`43`		`- * @group legacy`
	`43`	`+ * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException`
	`44`	`+ * @expectedExceptionMessage The name "button[]" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").`
`44`	`45`	`*/`
`45`	`46`	`public function testNameContainingIllegalCharacters()`
`46`	`47`	`{`