Merge 'main' into 2.x

jrushlow · jrushlow · commit 3ba8851f1a78 · 2024-04-09T15:42:26.000-04:00
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1,3 +1,13 @@
 # Upgrade from 1.x to 2.0
 
 ResetPasswordBundle now requires PHP `8.3`+ & Symfony `6.4.5`+
+
+## ResetPasswordHelper
+
+- Class became `@final` in `v1.22.0`. Extending this class will not be allowed
+  in version `v2.0.0`.
+
+## ResetPasswordRemoveExpiredCommand
+
+- Class became `@final` in `v1.22.0`. Extending this class will not be allowed
+  in version `v2.0.0`.
diff --git a/src/Command/ResetPasswordRemoveExpiredCommand.php b/src/Command/ResetPasswordRemoveExpiredCommand.php
@@ -17,6 +17,8 @@
 /**
  * @author Jesse Rushlow <jr@rushlow.dev>
  * @author Ryan Weaver   <ryan@symfonycasts.com>
+ *
+ * @final
  */
 class ResetPasswordRemoveExpiredCommand extends Command
 {
diff --git a/src/ResetPasswordHelper.php b/src/ResetPasswordHelper.php
@@ -21,6 +21,8 @@
 /**
  * @author Jesse Rushlow <jr@rushlow.dev>
  * @author Ryan Weaver   <ryan@symfonycasts.com>
+ *
+ * @final
  */
 class ResetPasswordHelper implements ResetPasswordHelperInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`/**`
`18`	`18`	`* @author Jesse Rushlow <jr@rushlow.dev>`
`19`	`19`	`* @author Ryan Weaver <ryan@symfonycasts.com>`
	`20`	`+ *`
	`21`	`+ * @final`
`20`	`22`	`*/`
`21`	`23`	`class ResetPasswordRemoveExpiredCommand extends Command`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`/**`
`22`	`22`	`* @author Jesse Rushlow <jr@rushlow.dev>`
`23`	`23`	`* @author Ryan Weaver <ryan@symfonycasts.com>`
	`24`	`+ *`
	`25`	`+ * @final`
`24`	`26`	`*/`
`25`	`27`	`class ResetPasswordHelper implements ResetPasswordHelperInterface`
`26`	`28`	`{`