Merge pull request #200 from rossriley/fix/return-early-on-redirect

return early if there is a redirect
bolt · Oct 18, 2017 · 6bac1b9 · 6bac1b9
2 parents c70043f + e254959
commit 6bac1b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Submission/Handler/Redirect.php b/src/Submission/Handler/Redirect.php
@@ -52,13 +52,14 @@ public function __construct(RedirectableUrlMatcher $urlMatcher)
      * Do a redirect.
      *
      * @param FormConfig $formConfig
-     * @param Entity     $formData
+     * @param Entity $formData
+     * @return RedirectResponse
      */
     public function handle(FormConfig $formConfig, Entity $formData)
     {
         $response = $this->getRedirectResponse($formConfig, $formData);
         if ($response instanceof RedirectResponse) {
-            $response->send();
+            return $response->send();
         }
     }
 

diff --git a/src/Submission/Processor/Redirect.php b/src/Submission/Processor/Redirect.php
@@ -6,6 +6,7 @@
 use Bolt\Extension\Bolt\BoltForms\Submission\Handler;
 use Pimple as Container;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -77,7 +78,10 @@ public function process(LifecycleEvent $lifeEvent, $eventName, EventDispatcherIn
         /** @var Handler\Redirect $handler */
         $handler = $this->handlers['redirect'];
         if ($formConfig->getFeedback()->getRedirectTarget() !== null) {
-            $handler->handle($formConfig, $formData);
+            $response = $handler->handle($formConfig, $formData);
+            if ($response instanceof RedirectResponse) {
+                return;
+            }
         }
 
         // Do a get on the page as it was probably POSTed