Merge branch '4.4' into 5.4

javiereguiluz · javiereguiluz · commit 1f999bf4be91 · 2022-11-21T17:39:21.000+01:00
* 4.4:
  Fix bad copy/paste
  Remove Magali from CARE
diff --git a/contributing/code_of_conduct/care_team.rst b/contributing/code_of_conduct/care_team.rst
@@ -37,12 +37,6 @@ of them at once by emailing ** care@symfony.com **.
   * *SymfonyConnect*: `zanbaldwin <https://connect.symfony.com/profile/zanbaldwin>`_
   * *SymfonySlack*: `@Zan <https://symfony-devs.slack.com/team/UBHGRU3NW>`_
 
-* **Magali Milbergue**
-
-  * *E-mail*: magali.milbergue [at] gmail.com
-  * *Twitter*: `@magalimilbergue <https://twitter.com/magalimilbergue>`_
-  * *SymfonyConnect*: `magali_milbergue <https://connect.symfony.com/profile/magali_milbergue>`_
-
 * **Tobias Nyholm**
 
   * *E-mail*: tobias.nyholm [at] gmail.com
diff --git a/controller.rst b/controller.rst
@@ -377,7 +377,7 @@ object. To access it in your controller, add it as an argument and
     use Symfony\Component\HttpFoundation\Response;
     // ...
 
-    public function index(Request $request, string $firstName, string $lastName): Response
+    public function index(Request $request): Response
     {
         $page = $request->query->get('page', 1);
 

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ object. To access it in your controller, add it as an argument and`
`377`	`377`	`use Symfony\Component\HttpFoundation\Response;`
`378`	`378`	`// ...`
`379`	`379`
`380`		`- public function index(Request $request, string $firstName, string $lastName): Response`
	`380`	`+ public function index(Request $request): Response`
`381`	`381`	`{`
`382`	`382`	`$page = $request->query->get('page', 1);`
`383`	`383`