Merge pull request #6 from Dumkaaa/Dumkaaa-patch-1

Dumkaaa patch 1
AndrewNovikof · Oct 16, 2018 · 12f00cb · 12f00cb
2 parents c73d1c4 + 529b178
commit 12f00cb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -156,14 +156,19 @@ public function sendData($data)
     {
         $url = $this->getEndPoint() . $this->getMethod();
         $this->validate('userName', 'password');
+        $data = array_merge(
+            [
+                'userName' => $this->getUserName(),
+                'password' => $this->getPassword(),
+            ],
+            $data
+        );
+
         $httpResponse = $this->httpClient->request(
             $this->getHttpMethod(),
             $url,
             $this->getHeaders(),
-            json_encode(array_merge([
-                'userName' => $this->getUserName(),
-                'password' => $this->getPassword()
-            ], $data))
+            http_build_query($data, '', '&')
         );
 
         $responseClassName = str_replace('Request', 'Response', \get_class($this));
@@ -174,7 +179,9 @@ public function sendData($data)
             );
         }
 
-        return $reflection->newInstance($this, json_decode($httpResponse->getBody(true), true));
+        $content = json_decode($httpResponse->getBody()->getContents(), true);
+
+        return $reflection->newInstance($this, $content);
     }
 
     /**

diff --git a/src/Message/AuthorizeRequest.php b/src/Message/AuthorizeRequest.php
@@ -241,14 +241,19 @@ public function sendData($data)
         $this->validate('userName', 'password');
         $data['currency'] = $this->getCurrencyNumeric();
         $data['amount'] = $this->getAmountInteger();
+        $data = array_merge(
+            [
+                'userName' => $this->getUserName(),
+                'password' => $this->getPassword(),
+            ],
+            $data
+        );
+
         $httpResponse = $this->httpClient->request(
             $this->getHttpMethod(),
             $url,
             $this->getHeaders(),
-            json_encode(array_merge([
-                'userName' => $this->getUserName(),
-                'password' => $this->getPassword()
-            ], $data))
+            http_build_query($data, '', '&')
         );
 
         $responseClassName = str_replace('Request', 'Response', \get_class($this));
@@ -259,6 +264,8 @@ public function sendData($data)
             );
         }
 
-        return $reflection->newInstance($this, json_decode($httpResponse->getBody(true), true));
+        $content = json_decode($httpResponse->getBody()->getContents(), true);
+
+        return $reflection->newInstance($this, $content);
     }
 }