pass $data as second parameter

dunglas · dunglas · commit 3db80cac7da8 · 2021-04-16T17:29:23.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -297,19 +297,21 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
      * * if the form is submitted but invalid, $render is called and a 422 HTTP status code is set if the current status hasn't been customized
      * * if the form is submitted and valid, $onSuccess is called, usually this method saves the data and returns a 303 HTTP redirection
      *
-     * @param callable(FormInterface): Response $onSuccess
-     * @param callable(FormInterface): Response $render
+     * @param callable(FormInterface, mixed): Response $onSuccess
+     * @param callable(FormInterface, mixed): Response $render
      */
     public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response
     {
         $form->handleRequest($request);
 
         $submitted = $form->isSubmitted();
+
+        $data = $form->getData();
         if ($submitted && $form->isValid()) {
-            return $onSuccess($form);
+            return $onSuccess($form, $data);
         }
 
-        $response = $render($form);
+        $response = $render($form, $data);
         if ($submitted && 200 === $response->getStatusCode()) {
             $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -433,10 +433,10 @@ public function testHandleFormNotSubmitted()
         $response = $controller->handleForm(
             $form,
             Request::create('https://example.com'),
-            function (FormInterface $form): Response {
+            function (FormInterface $form, $data): Response {
                 return new RedirectResponse('https://example.com/redir', Response::HTTP_SEE_OTHER);
             },
-            function (FormInterface $form): Response {
+            function (FormInterface $form, $data): Response {
                 return new Response('rendered');
             }
         );

Original file line number	Diff line number	Diff line change
`@@ -297,19 +297,21 @@ protected function stream(string $view, array $parameters = [], StreamedResponse`
`297`	`297`	`* * if the form is submitted but invalid, $render is called and a 422 HTTP status code is set if the current status hasn't been customized`
`298`	`298`	`* * if the form is submitted and valid, $onSuccess is called, usually this method saves the data and returns a 303 HTTP redirection`
`299`	`299`	`*`
`300`		`- * @param callable(FormInterface): Response $onSuccess`
`301`		`- * @param callable(FormInterface): Response $render`
	`300`	`+ * @param callable(FormInterface, mixed): Response $onSuccess`
	`301`	`+ * @param callable(FormInterface, mixed): Response $render`
`302`	`302`	`*/`
`303`	`303`	`public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response`
`304`	`304`	`{`
`305`	`305`	`$form->handleRequest($request);`
`306`	`306`
`307`	`307`	`$submitted = $form->isSubmitted();`
	`308`	`+`
	`309`	`+ $data = $form->getData();`
`308`	`310`	`if ($submitted && $form->isValid()) {`
`309`		`- return $onSuccess($form);`
	`311`	`+ return $onSuccess($form, $data);`
`310`	`312`	`}`
`311`	`313`
`312`		`- $response = $render($form);`
	`314`	`+ $response = $render($form, $data);`
`313`	`315`	`if ($submitted && 200 === $response->getStatusCode()) {`
`314`	`316`	`$response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);`
`315`	`317`	`}`