feature #51076 [Form] Remove deprecations in form events (HeahDude)

fabpot · fabpot · commit d33c00bcd146 · 2023-07-26T07:55:03.000+02:00
This PR was merged into the 7.0 branch. Discussion ---------- [Form] Remove deprecations in form events | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | ~ | License | MIT | Doc PR | ~ Commits ------- 87c91fb [Form] Remove deprecations in form events
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -99,6 +99,8 @@ Form
    `model_timezone` option in `DateType`, `DateTimeType`, and `TimeType`
  * Make the "widget" option of date/time form types default to "single_text"
  * Require explicit argument when calling `Button/Form::setParent()`, `ButtonBuilder/FormConfigBuilder::setDataMapper()`, `TransformationFailedException::setInvalidMessage()`
+ * `PostSetDataEvent::setData()` throws an exception, use `PreSetDataEvent::setData()` instead
+ * `PostSubmitEvent::setData()` throws an exception, use `PreSubmitDataEvent::setData()` or `SubmitDataEvent::setData()` instead
 
 FrameworkBundle
 ---------------
diff --git a/src/Symfony/Component/Form/Event/PostSetDataEvent.php b/src/Symfony/Component/Form/Event/PostSetDataEvent.php
@@ -22,12 +22,8 @@
  */
 final class PostSetDataEvent extends FormEvent
 {
-    /**
-     * @deprecated since Symfony 6.4, it will throw an exception in 7.0.
-     */
     public function setData(mixed $data): void
     {
-        trigger_deprecation('symfony/form', '6.4', 'Calling "%s()" will throw an exception as of 7.0, listen to "form.pre_set_data" instead.', __METHOD__);
-        // throw new BadMethodCallException('Form data cannot be changed during "form.post_set_data", you should use "form.pre_set_data" instead.');
+        throw new BadMethodCallException('Form data cannot be changed during "form.post_set_data", you should use "form.pre_set_data" instead.');
     }
 }
diff --git a/src/Symfony/Component/Form/Event/PostSubmitEvent.php b/src/Symfony/Component/Form/Event/PostSubmitEvent.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Event;
 
+use Symfony\Component\Form\Exception\BadMethodCallException;
 use Symfony\Component\Form\FormEvent;
 
 /**
@@ -21,12 +22,8 @@
  */
 final class PostSubmitEvent extends FormEvent
 {
-    /**
-     * @deprecated since Symfony 6.4, it will throw an exception in 7.0.
-     */
     public function setData(mixed $data): void
     {
-        trigger_deprecation('symfony/form', '6.4', 'Calling "%s()" will throw an exception as of 7.0, listen to "form.pre_submit" or "form.submit" instead.', __METHOD__);
-        // throw new BadMethodCallException('Form data cannot be changed during "form.post_submit", you should use "form.pre_submit" or "form.submit" instead.');
+        throw new BadMethodCallException('Form data cannot be changed during "form.post_submit", you should use "form.pre_submit" or "form.submit" instead.');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`final class PostSetDataEvent extends FormEvent`
`24`	`24`	`{`
`25`		`- /**`
`26`		`- * @deprecated since Symfony 6.4, it will throw an exception in 7.0.`
`27`		`- */`
`28`	`25`	`public function setData(mixed $data): void`
`29`	`26`	`{`
`30`		`- trigger_deprecation('symfony/form', '6.4', 'Calling "%s()" will throw an exception as of 7.0, listen to "form.pre_set_data" instead.', __METHOD__);`
`31`		`- // throw new BadMethodCallException('Form data cannot be changed during "form.post_set_data", you should use "form.pre_set_data" instead.');`
	`27`	`+ throw new BadMethodCallException('Form data cannot be changed during "form.post_set_data", you should use "form.pre_set_data" instead.');`
`32`	`28`	`}`
`33`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Event;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Exception\BadMethodCallException;`
`14`	`15`	`use Symfony\Component\Form\FormEvent;`
`15`	`16`
`16`	`17`	`/**`
`@@ -21,12 +22,8 @@`
`21`	`22`	`*/`
`22`	`23`	`final class PostSubmitEvent extends FormEvent`
`23`	`24`	`{`
`24`		`- /**`
`25`		`- * @deprecated since Symfony 6.4, it will throw an exception in 7.0.`
`26`		`- */`
`27`	`25`	`public function setData(mixed $data): void`
`28`	`26`	`{`
`29`		`- trigger_deprecation('symfony/form', '6.4', 'Calling "%s()" will throw an exception as of 7.0, listen to "form.pre_submit" or "form.submit" instead.', __METHOD__);`
`30`		`- // throw new BadMethodCallException('Form data cannot be changed during "form.post_submit", you should use "form.pre_submit" or "form.submit" instead.');`
	`27`	`+ throw new BadMethodCallException('Form data cannot be changed during "form.post_submit", you should use "form.pre_submit" or "form.submit" instead.');`
`31`	`28`	`}`
`32`	`29`	`}`