Simplify redirectresponse method

barryvdh · barryvdh · commit f9fb5e9aac12 · 2017-04-24T22:34:29.000+02:00
diff --git a/src/Omnipay/Common/Message/AbstractResponse.php b/src/Omnipay/Common/Message/AbstractResponse.php
@@ -205,51 +205,63 @@ public function redirect()
      */
     public function getRedirectResponse()
     {
-        if (!$this instanceof RedirectResponseInterface || !$this->isRedirect()) {
-            throw new RuntimeException('This response does not support redirection.');
+        $this->validateRedirect();
+
+        if ('GET' === $this->getRedirectMethod()) {
+            return HttpRedirectResponse::create($this->getRedirectUrl());
         }
 
-        if (empty($this->getRedirectUrl())) {
-            throw new RuntimeException('The given redirectUrl cannot be empty.');
+        $hiddenFields = '';
+        foreach ($this->getRedirectData() as $key => $value) {
+            $hiddenFields .= sprintf(
+                '<input type="hidden" name="%1$s" value="%2$s" />',
+                htmlentities($key, ENT_QUOTES, 'UTF-8', false),
+                htmlentities($value, ENT_QUOTES, 'UTF-8', false)
+            )."\n";
         }
 
-        if ('GET' === $this->getRedirectMethod()) {
-            return HttpRedirectResponse::create($this->getRedirectUrl());
-        } elseif ('POST' === $this->getRedirectMethod()) {
-            $hiddenFields = '';
-            foreach ($this->getRedirectData() as $key => $value) {
-                $hiddenFields .= sprintf(
-                    '<input type="hidden" name="%1$s" value="%2$s" />',
-                    htmlentities($key, ENT_QUOTES, 'UTF-8', false),
-                    htmlentities($value, ENT_QUOTES, 'UTF-8', false)
-                )."\n";
-            }
-
-            $output = '<!DOCTYPE html>
+        $output = '<!DOCTYPE html>
 <html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>Redirecting...</title>
-    </head>
-    <body onload="document.forms[0].submit();">
-        <form action="%1$s" method="post">
-            <p>Redirecting to payment page...</p>
-            <p>
-                %2$s
-                <input type="submit" value="Continue" />
-            </p>
-        </form>
-    </body>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Redirecting...</title>
+</head>
+<body onload="document.forms[0].submit();">
+    <form action="%1$s" method="post">
+        <p>Redirecting to payment page...</p>
+        <p>
+            %2$s
+            <input type="submit" value="Continue" />
+        </p>
+    </form>
+</body>
 </html>';
-            $output = sprintf(
-                $output,
-                htmlentities($this->getRedirectUrl(), ENT_QUOTES, 'UTF-8', false),
-                $hiddenFields
-            );
+        $output = sprintf(
+            $output,
+            htmlentities($this->getRedirectUrl(), ENT_QUOTES, 'UTF-8', false),
+            $hiddenFields
+        );
 
-            return HttpResponse::create($output);
+        return HttpResponse::create($output);
+    }
+
+    /**
+     * Validate that the current Response is a valid redirect.
+     *
+     * @return void
+     */
+    protected function validateRedirect()
+    {
+        if (!$this instanceof RedirectResponseInterface || !$this->isRedirect()) {
+            throw new RuntimeException('This response does not support redirection.');
         }
 
-        throw new RuntimeException('Invalid redirect method "'.$this->getRedirectMethod().'".');
+        if (empty($this->getRedirectUrl())) {
+            throw new RuntimeException('The given redirectUrl cannot be empty.');
+        }
+
+        if (!in_array($this->getRedirectMethod(), ['GET', 'POST'])) {
+            throw new RuntimeException('Invalid redirect method "'.$this->getRedirectMethod().'".');
+        }
     }
 }
