symfony
diff --git a/‎UPGRADE-5.4.md
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎UPGRADE-5.4.md
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+48Lines changed: 48 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+48Lines changed: 48 additions & 0 deletions
@@ -0,0 +1,7 @@
+UPGRADE FROM 5.3 to 5.4
+=======================
+
+FrameworkBundle
+---------------
+
+ * Deprecate `AbstractController::handleForm()`, use `AbstractController::handleForm()` instead
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.4
+---
+
+ * Deprecate `AbstractController::handleForm()`
+ * Added `AbstractController::renderForm()` to render a form and set the appropriate HTTP status code
+
 5.3
 ---
 
 
@@ -266,6 +266,20 @@ protected function render(string $view, array $parameters = [], Response $respon
         return $response;
     }
 
+    /**
+     * Renders a view for a form.
+     */
+    protected function renderForm(string $view, FormInterface $form, array $parameters = [], Response $response = null): Response
+    {
+        $response = $this->render($view, $parameters, $response);
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $response->setStatusCode(422);
+        }
+
+        return $response;
+    }
+
     /**
      * Streams a view.
      */
@@ -302,6 +316,8 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
      */
     public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response
     {
+        trigger_deprecation('symfony/framework-bundle', '5.3', 'The method %s() is deprecated, use %s::renderForm() instead.', __METHOD__, __CLASS__);
+
         $form->handleRequest($request);
 
         $submitted = $form->isSubmitted();
 
@@ -21,6 +21,7 @@
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormConfigInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -411,6 +412,44 @@ public function testRenderTwig()
         $this->assertEquals('bar', $controller->render('foo')->getContent());
     }
 
+    public function testRenderFormNew()
+    {
+        $twig = $this->createMock(Environment::class);
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('twig', $twig);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+        $form = new Form($this->createMock(FormConfigInterface::class));
+
+        $response = $controller->renderForm('foo', $form);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('bar', $response->getContent());
+    }
+
+    public function testRenderFormSubmittedAndInvalid()
+    {
+        $twig = $this->createMock(Environment::class);
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('twig', $twig);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+        $form = new Form($this->createMock(FormConfigInterface::class));
+        $formReflection = new \ReflectionProperty($form, 'submitted');
+        $formReflection->setAccessible(true);
+        $formReflection->setValue($form, true);
+        $form->addError(new FormError('message'));
+
+        $response = $controller->renderForm('foo', $form);
+        $this->assertEquals(422, $response->getStatusCode());
+        $this->assertEquals('bar', $response->getContent());
+    }
+
     public function testStreamTwig()
     {
         $twig = $this->createMock(Environment::class);
@@ -424,6 +463,9 @@ public function testStreamTwig()
         $this->assertInstanceOf(StreamedResponse::class, $controller->stream('foo'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testHandleFormNotSubmitted()
     {
         $form = $this->createMock(FormInterface::class);
@@ -445,6 +487,9 @@ function (FormInterface $form, $data): Response {
         $this->assertSame('rendered', $response->getContent());
     }
 
+    /**
+     * @group legacy
+     */
     public function testHandleFormInvalid()
     {
         $form = $this->createMock(FormInterface::class);
@@ -467,6 +512,9 @@ function (FormInterface $form): Response {
         $this->assertSame('rendered', $response->getContent());
     }
 
+    /**
+     * @group legacy
+     */
     public function testHandleFormValid()
     {
         $form = $this->createMock(FormInterface::class);