[FrameworkBundle] Added ControllerTrait::isFormValid

lyrixx · lyrixx · commit b4e9ffcd3e51 · 2018-09-25T14:36:16.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -11,9 +11,10 @@ CHANGELOG
  * Deprecated the `Symfony\Bundle\FrameworkBundle\Controller\Controller` class in favor of `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`.
  * Enabled autoconfiguration for `Psr\Log\LoggerAwareInterface`
  * Added new "auto" mode for `framework.session.cookie_secure` to turn it on when HTTPS is used
- * Removed the `framework.messenger.encoder` and `framework.messenger.decoder` options. Use the `framework.messenger.serializer.id` option to replace the Messenger serializer. 
+ * Removed the `framework.messenger.encoder` and `framework.messenger.decoder` options. Use the `framework.messenger.serializer.id` option to replace the Messenger serializer.
  * Deprecated the `ContainerAwareCommand` class in favor of `Symfony\Component\Console\Command\Command`
  * Made `debug:container` and `debug:autowiring` ignore backslashes in service ids
+ * Added `ControllerTrait::isFormValid`
 
 4.1.0
 -----
@@ -75,17 +76,17 @@ CHANGELOG
  * Deprecated the `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` methods.
  * Deprecated `AddCacheClearerPass`, use tagged iterator arguments instead.
  * Deprecated `AddCacheWarmerPass`, use tagged iterator arguments instead.
- * Deprecated `TranslationDumperPass`, use 
+ * Deprecated `TranslationDumperPass`, use
    `Symfony\Component\Translation\DependencyInjection\TranslationDumperPass` instead
- * Deprecated `TranslationExtractorPass`, use 
+ * Deprecated `TranslationExtractorPass`, use
    `Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass` instead
- * Deprecated `TranslatorPass`, use 
+ * Deprecated `TranslatorPass`, use
    `Symfony\Component\Translation\DependencyInjection\TranslatorPass` instead
  * Added `command` attribute to the `console.command` tag which takes the command
    name as value, using it makes the command lazy
  * Added `cache:pool:prune` command to allow manual stale cache item pruning of supported PSR-6 and PSR-16 cache pool
    implementations
- * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use 
+ * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use
    `Symfony\Component\Translation\Reader\TranslationReader` instead
  * Deprecated `translation.loader` service, use `translation.reader` instead
  * `AssetsInstallCommand::__construct()` now takes an instance of
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -19,6 +19,7 @@
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -321,6 +322,24 @@ protected function createFormBuilder($data = null, array $options = array()): Fo
         return $this->container->get('form.factory')->createBuilder(FormType::class, $data, $options);
     }
 
+    /**
+     * Handles request and check form validity.
+     *
+     * @final
+     */
+    protected function isFormValid(FormInterface $form, Request $request = null): bool
+    {
+        if (!$request) {
+            $request = $this->container->get('request_stack')->getCurrentRequest();
+        }
+
+        if (!$request) {
+            throw new \LogicException('You must pass a request as second argument because the request stack was empty.');
+        }
+
+        return $form->handleRequest($request)->isSubmitted() && $form->isValid();
+    }
+
     /**
      * Shortcut to return the Doctrine Registry service.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -516,6 +516,77 @@ public function testCreateFormBuilder()
         $this->assertEquals($formBuilder, $controller->createFormBuilder('foo'));
     }
 
+    public function testIsFormValidWhenInvalid()
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push($request = new Request());
+
+        $container = new Container();
+        $container->set('request_stack', $requestStack);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
+        $form
+            ->expects($this->once())
+            ->method('handleRequest')
+            ->with($request)
+            ->willReturn($form)
+        ;
+
+        $this->assertFalse($controller->isFormValid($form));
+    }
+
+    public function testIsFormValidWhenValid()
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push($request = new Request());
+
+        $container = new Container();
+        $container->set('request_stack', $requestStack);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
+        $form
+            ->expects($this->once())
+            ->method('handleRequest')
+            ->with($request)
+            ->willReturn($form)
+        ;
+        $form
+            ->expects($this->once())
+            ->method('isSubmitted')
+            ->willReturn(true)
+        ;
+        $form
+            ->expects($this->once())
+            ->method('isValid')
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($controller->isFormValid($form));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage You must pass a request as second argument because the request stack was empty.
+     */
+    public function testIsFormValidWhenRequestStackIsEmpty()
+    {
+        $container = new Container();
+        $container->set('request_stack', new RequestStack());
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
+
+        $this->assertTrue($controller->isFormValid($form));
+    }
+
     public function testGetDoctrine()
     {
         $doctrine = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
@@ -552,5 +623,6 @@ trait TestControllerTrait
         createForm as public;
         createFormBuilder as public;
         getDoctrine as public;
+        isFormValid as public;
     }
 }
