refactor - InterPos use http_build_query in Serializer instead of for…

…m_params when sending request Eventually, I will remove form_params option from HttpClient everywhere. Currently, form_params is only used PayFlexV4Pos, but replacing form_params will take big changes, which is planned in v2
mewebstudio · Feb 18, 2025 · 2695310 · 2695310
1 parent 65844b0
commit 2695310
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/src/Gateways/InterPos.php b/src/Gateways/InterPos.php
@@ -191,11 +191,17 @@ public function get3DFormData(array $order, string $paymentModel, string $txType
     protected function send($contents, string $txType, string $paymentModel, string $url): array
     {
         $this->logger->debug('sending request', ['url' => $url]);
-        if (!\is_array($contents)) {
-            throw new InvalidArgumentException(\sprintf('Argument type must be array, %s provided.', \gettype($contents)));
+        if (!\is_string($contents)) {
+            throw new InvalidArgumentException(\sprintf('Argument type must be string, %s provided.', \gettype($contents)));
         }
 
-        $response = $this->client->post($url, ['form_params' => $contents]);
+        $response = $this->client->post($url, [
+            'headers' => [
+                'Content-Type' => 'application/x-www-form-urlencoded',
+            ],
+            'body'    => $contents,
+        ]);
+
         $this->logger->debug('request completed', ['status_code' => $response->getStatusCode()]);
 
         return $this->data = $this->serializer->decode($response->getBody()->getContents(), $txType);

diff --git a/src/Serializer/InterPosSerializer.php b/src/Serializer/InterPosSerializer.php
@@ -22,11 +22,11 @@ public static function supports(string $gatewayClass): bool
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return string
      */
-    public function encode(array $data, ?string $txType = null): array
+    public function encode(array $data, ?string $txType = null): string
     {
-        return $data;
+        return \http_build_query($data);
     }
 
     /**

diff --git a/tests/Unit/Gateways/InterPosTest.php b/tests/Unit/Gateways/InterPosTest.php
@@ -241,7 +241,7 @@ public function testMake3DPayment(
                 $txType,
                 $this->config['gateway_endpoints']['payment_api'],
                 $create3DPaymentRequestData,
-                ['request-body'],
+                'request-body',
                 'response-body',
                 $paymentResponse,
                 $order,
@@ -386,7 +386,7 @@ public function testMakeRegularPayment(array $order, string $txType, string $api
             $txType,
             $apiUrl,
             $requestData,
-            ['request-body'],
+            'request-body',
             'response-body',
             $decodedResponse,
             $order,
@@ -420,7 +420,7 @@ public function testMakeRegularPostAuthPayment(array $order, string $apiUrl): vo
             $txType,
             $apiUrl,
             $requestData,
-            ['request-body'],
+            'request-body',
             'response-body',
             $decodedResponse,
             $order,
@@ -455,7 +455,7 @@ public function testStatusRequest(array $order, string $apiUrl): void
             $txType,
             $apiUrl,
             $requestData,
-            ['request-body'],
+            'request-body',
             'response-body',
             $decodedResponse,
             $order,
@@ -489,7 +489,7 @@ public function testCancelRequest(array $order, string $apiUrl): void
             $txType,
             $apiUrl,
             $requestData,
-            ['request-body'],
+            'request-body',
             'response-body',
             $decodedResponse,
             $order,
@@ -523,7 +523,7 @@ public function testRefundRequest(array $order, string $apiUrl): void
             $txType,
             $apiUrl,
             $requestData,
-            ['request-body'],
+            'request-body',
             'response-body',
             $decodedResponse,
             $order,
@@ -558,7 +558,7 @@ public function testCustomQueryRequest(array $requestData, ?string $apiUrl, stri
             $txType,
             $expectedApiUrl,
             $updatedRequestData,
-            $updatedRequestData,
+            '$updatedRequestData',
             'response-body',
             ['decodedResponse'],
             $requestData,
@@ -729,7 +729,7 @@ private function configureClientResponse(
         string $txType,
         string $apiUrl,
         array  $requestData,
-        array  $encodedRequestData,
+        string $encodedRequestData,
         string $responseContent,
         array  $decodedResponse,
         array  $order,
@@ -752,7 +752,10 @@ private function configureClientResponse(
             $responseContent,
             $apiUrl,
             [
-                'form_params' => $encodedRequestData,
+                'headers' => [
+                    'Content-Type' => 'application/x-www-form-urlencoded',
+                ],
+                'body' => $encodedRequestData,
             ],
         );
 

diff --git a/tests/Unit/Serializer/InterPosSerializerTest.php b/tests/Unit/Serializer/InterPosSerializerTest.php
@@ -33,10 +33,13 @@ public function testSupports(): void
 
     public function testEncode(): void
     {
-        $data   = ['abc' => '1'];
+        $data = [
+            'abc' => '1',
+            'sa'  => 'aa',
+        ];
         $result = $this->serializer->encode($data);
 
-        $this->assertSame($data, $result);
+        $this->assertSame('abc=1&sa=aa', $result);
     }
 
     /**