Improve AbstractResponse::redirect()

amacneil · amacneil · commit 3bfcfefb4376 · 2013-03-10T17:42:07.000+07:00
diff --git a/src/Omnipay/Common/Message/AbstractResponse.php b/src/Omnipay/Common/Message/AbstractResponse.php
@@ -62,6 +62,9 @@ public function getTransactionReference()
 
     /**
      * Automatically perform any required redirect
+     *
+     * This method is meant to be a helper for simple scenarios. If you want to customize the
+     * redirection page, just call the getRedirectUrl() and getRedirectData() methods directly.
      */
     public function redirect()
     {
@@ -70,44 +73,39 @@ public function redirect()
         }
 
         if ('GET' === $this->getRedirectMethod()) {
-            return HttpRedirectResponse::create($this->getRedirectUrl())->send();
+            HttpRedirectResponse::create($this->getRedirectUrl())->send();
+            exit;
         } elseif ('POST' === $this->getRedirectMethod()) {
-            $hiddenFields = implode(
-                "\n",
-                array_map(
-                    function ($name, $value) {
-                        return sprintf(
-                            '<input type="hidden" name="%1$s" value="%2$s" />',
-                            htmlspecialchars($name, ENT_QUOTES, 'UTF-8'),
-                            htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
-                        );
-                    },
-                    $this->getRedirectData()
-                )
-            );
-
-            $output = <<<EOF
-<!DOCTYPE html>
+            $hiddenFields = '';
+            foreach ($this->getRedirectData() as $key => $value) {
+                $hiddenFields .= sprintf(
+                    '<input type="hidden" name="%1$s" value="%2$s" />',
+                    htmlspecialchars($key, ENT_QUOTES, 'UTF-8'),
+                    htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
+                )."\n";
+            }
+
+            $output = '<!DOCTYPE html>
 <html>
     <head>
         <title>Redirecting...</title>
     </head>
     <body onload="document.forms[0].submit();">
         <form action="%1$s" method="post">
-            <p>Redirecting to payment gateway...</p>
+            <p>Redirecting to payment page...</p>
             <p>
                 %2$s
                 <input type="submit" value="Continue" />
             </p>
         </form>
     </body>
 </html>';
-EOF;
             $output = sprintf($output, htmlspecialchars($this->redirectUrl, ENT_QUOTES, 'UTF-8'), $hiddenFields);
 
-            return HttpResponse::create($output)->send();
+            HttpResponse::create($output)->send();
+            exit;
         }
 
-        throw new RuntimeException("Unexpected redirect method '{$response->getRedirectMethod()}'");
+        throw new RuntimeException('Invalid redirect method "'.$response->getRedirectMethod().'".');
     }
 }
