swap request and form

dunglas · dunglas · commit 66cea262d368 · 2021-04-16T13:56:50.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -300,7 +300,7 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
      * @param callable(FormInterface): Response $onSuccess
      * @param callable(FormInterface): Response $render
      */
-    public function handleForm(Request $request, FormInterface $form, callable $onSuccess, callable $render): Response
+    public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response
     {
         $form->handleRequest($request);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -431,8 +431,8 @@ public function testHandleFormNotSubmitted()
 
         $controller = $this->createController();
         $response = $controller->handleForm(
-            Request::create('https://example.com'),
             $form,
+            Request::create('https://example.com'),
             function (FormInterface $form): Response {
                 return new RedirectResponse('https://example.com/redir', Response::HTTP_SEE_OTHER);
             },
@@ -453,8 +453,8 @@ public function testHandleFormInvalid()
 
         $controller = $this->createController();
         $response = $controller->handleForm(
-            Request::create('https://example.com'),
             $form,
+            Request::create('https://example.com'),
             function (FormInterface $form): Response {
                 return new RedirectResponse('https://example.com/redir', Response::HTTP_SEE_OTHER);
             },
@@ -475,8 +475,8 @@ public function testHandleFormValid()
 
         $controller = $this->createController();
         $response = $controller->handleForm(
-            Request::create('https://example.com'),
             $form,
+            Request::create('https://example.com'),
             function (FormInterface $form): Response {
                 return new RedirectResponse('https://example.com/redir', Response::HTTP_SEE_OTHER);
             },

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ protected function stream(string $view, array $parameters = [], StreamedResponse`
`300`	`300`	`* @param callable(FormInterface): Response $onSuccess`
`301`	`301`	`* @param callable(FormInterface): Response $render`
`302`	`302`	`*/`
`303`		`- public function handleForm(Request $request, FormInterface $form, callable $onSuccess, callable $render): Response`
	`303`	`+ public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response`
`304`	`304`	`{`
`305`	`305`	`$form->handleRequest($request);`
`306`	`306`