feat: throw invalid request exception

Author: recca0120

src/Message/CompletePurchaseRequest.php

@@ -5,6 +5,7 @@
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\AbstractRequest;
 use Omnipay\Common\Message\NotificationInterface;
+use Omnipay\Common\Message\ResponseInterface;
 use Omnipay\ECPay\Traits\HasCustomFields;
 use Omnipay\ECPay\Traits\HasDefaults;
 use Omnipay\ECPay\Traits\HasMerchantTradeNo;
@@ -236,7 +237,7 @@ public function getMessage()
     }
 
     /**
-     * @return NotificationInterface
+     * @return ResponseInterface
      */
     private function getNotification()
     {

src/Message/PurchaseResponse.php

@@ -2,6 +2,8 @@
 
 namespace Omnipay\ECPay\Message;
 
+use Exception;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\AbstractResponse;
 use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\ECPay\Traits\HasECPay;
@@ -54,13 +56,18 @@ public function getRedirectMethod()
      * Gets the redirect form data array, if the redirect method is POST.
      *
      * @return array
+     * @throws InvalidRequestException
      */
     public function getRedirectData()
     {
         $ecPay = $this->createECPay($this->request);
         $ecPay->ServiceURL = $this->getRedirectUrl();
 
-        return static::htmlToArray($ecPay->CheckoutString());
+        try {
+            return static::htmlToArray($ecPay->CheckoutString());
+        } catch (Exception $e) {
+            throw new InvalidRequestException($e->getMessage(), $e->getCode(), $e);
+        }
     }
 
     /**
@@ -69,21 +76,16 @@ public function getRedirectData()
      */
     private static function htmlToArray($html)
     {
-        preg_match_all('/<input[^>]*>/i', $html, $matches);
-
-        if (! $matches) {
-            return [];
-        }
+        preg_match_all('/<input(?!type="submit")[^>]*>/i', $html, $matches);
 
-        $data = [];
-        foreach ($matches[0] as $input) {
+        return ! $matches ? [] : array_reduce($matches[0], static function ($data, $input) {
             preg_match_all('/\s*([^=]+)=\"([^\"]*)\"*/', $input, $m);
             list($type, $name, $value) = $m[2];
             if ($type !== 'submit') {
                 $data[$name] = $value;
             }
-        }
 
-        return $data;
+            return $data;
+        }, []);
     }
 }

tests/Message/FetchTransactionRequestTest.php

@@ -25,7 +25,6 @@ public function testGetData()
             'HashIV' => 'v77hoKGq4kWxNNIS',
             'EncryptType' => '1',
             'MerchantID' => '2000132',
-            'testMode' => true,
         ], $options));
         $request->setTestMode(true);
 

tests/Message/PurchaseRequestTest.php

@@ -17,7 +17,6 @@ public function testGetData()
         $returnUrl = 'https://foo.bar/return_url';
         $notifyUrl = 'https://foo.bar/notify_url';
         $options = [
-
             'ReturnURL' => $notifyUrl,
             'ClientBackURL' => 'https://foo.bar/client_back_url',
             'OrderResultURL' => $returnUrl,
@@ -77,6 +76,7 @@ public function testSendData($results)
 
         $redirectData = $response->getRedirectData();
 
+        self::assertArrayNotHasKey('__paymentButton', $redirectData);
         self::assertFalse($response->isSuccessful());
         self::assertTrue($response->isRedirect());
         self::assertEquals('POST', $response->getRedirectMethod());