Merge branch '6.2' into 6.3

OskarStark · OskarStark · commit 3516035312d4 · 2023-04-20T14:36:56.000+02:00
* 6.2:
  Update forms.rst
  add Void to delete method
diff --git a/forms.rst b/forms.rst
@@ -284,7 +284,7 @@ transform the form into a *form view* instance.
 .. deprecated:: 6.2
 
     Prior to Symfony 6.2, you had to use ``$this->render(..., ['form' => $form->createView()])``
-    or the ``renderForm()`` method to render to form. The ``renderForm()``
+    or the ``renderForm()`` method to render the form. The ``renderForm()``
     method is deprecated in favor of directly passing the ``FormInterface``
     instance to ``render()``.
 
diff --git a/security/passwords.rst b/security/passwords.rst
@@ -231,7 +231,7 @@ After configuring the correct algorithm, you can use the
                 // ...
             }
 
-            public function delete(UserPasswordHasherInterface $passwordHasher, UserInterface $user)
+            public function delete(UserPasswordHasherInterface $passwordHasher, UserInterface $user): void
             {
                 // ... e.g. get the password from a "confirm deletion" dialog
                 $plaintextPassword = ...;

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ After configuring the correct algorithm, you can use the`
`231`	`231`	`// ...`
`232`	`232`	`}`
`233`	`233`
`234`		`- public function delete(UserPasswordHasherInterface $passwordHasher, UserInterface $user)`
	`234`	`+ public function delete(UserPasswordHasherInterface $passwordHasher, UserInterface $user): void`
`235`	`235`	`{`
`236`	`236`	`// ... e.g. get the password from a "confirm deletion" dialog`
`237`	`237`	`$plaintextPassword = ...;`