new iteration

dunglas · dunglas · commit b23fe897d669 · 2021-04-13T18:38:07.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -291,51 +291,26 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
     }
 
     /**
-     * Handles a form:
+     * Handles a form.
      *
-     * * if the form is not submitted, the Twig template passed in $view is rendered and a 200 HTTP status code is set
-     * * if the form is submitted but invalid, the Twig template passed in $view is rendered and 422 HTTP status code is set
-     * * if the form is submitted and valid, the entity is saved (only if it is managed by Doctrine ORM), a 306 HTTP status code is set and the Location HTTP header is set to the value of $redirectUrl
+     * * if the form is not submitted, $render is called
+     * * 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 306 HTTP redirection
+     *
+     * @param callable(FormInterface): Response $onSuccess
+     * @param callable(FormInterface): Response $render
      */
-    public function handleForm(Request $request, FormInterface $form, string $view, ?string $redirectUrl = null, ?callable $onSuccess = null, array $viewParameters = [], ?Response $response = null): Response
+    public function handleForm(Request $request, FormInterface $form, callable $onSuccess, callable $render): Response
     {
         $form->handleRequest($request);
 
         $submitted = $form->isSubmitted();
-        $valid = $submitted && $form->isValid();
-
-        if ($valid) {
-            if (null !== $onSuccess) {
-                return $onSuccess();
-            }
-
-            $data = $form->getData();
-            if ($manager = $this->getDoctrine()->getManagerForClass(get_class($data))) {
-                $manager->persist($data);
-                $manager->flush();
-            }
-
-            return $this->redirect($redirectUrl, Response::HTTP_SEE_OTHER);
-        }
-
-        $response = $this->render($view, ['form' => $form->createView()] + $viewParameters, $response);
-        if ($submitted) {
-            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
+        if ($submitted && $form->isValid()) {
+            return $onSuccess($form);
         }
 
-        return $response;
-    }
-
-    /**
-     * Renders a form.
-     *
-     * The FormView instance is passed to the template in a variable named "form".
-     * If the form is invalid, a 422 status code is returned.
-     */
-    public function renderForm(string $view, FormInterface $form, array $parameters = [], Response $response = null): Response
-    {
-        $response = $this->render($view, ['form' => $form->createView()] + $parameters, $response);
-        if ($form->isSubmitted() && !$form->isValid()) {
+        $response = $render($form);
+        if ($submitted && 200 === $response->getStatusCode()) {
             $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
