Merge pull request #2 from Punksolid/fix-order-optional-deprecation8.2

Bitso refactor better separation of concerns

Author: Punksolid

BitsoAPI/Bitso.php

@@ -133,7 +133,7 @@ public function account_status(): array
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
 
@@ -176,7 +176,7 @@ public function fees(): array
         $HTTPMethod = 'GET';
         $JSONPayload = '';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
 
@@ -208,7 +208,7 @@ public function withdrawals(
         $RequestPath = '/api/v3/withdrawals/?'.$parameters;
         $HTTPMethod = 'GET';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, '', $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, '');
     }
 
     public function fundings($params = []): array
@@ -244,7 +244,7 @@ public function fundings($params = []): array
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function user_trades($params = [], $ids = []): array
@@ -275,7 +275,7 @@ public function user_trades($params = [], $ids = []): array
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function open_orders($params): array
@@ -297,7 +297,7 @@ public function open_orders($params): array
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function lookup_order($ids)
@@ -319,7 +319,7 @@ public function lookup_order($ids)
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function cancel_order($ids): array
@@ -336,7 +336,7 @@ public function cancel_order($ids): array
         $HTTPMethod = 'DELETE';
         $JSONPayload = '';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function place_order($params): array
@@ -346,7 +346,7 @@ public function place_order($params): array
         $HTTPMethod = 'POST';
         $JSONPayload = json_encode($params, JSON_THROW_ON_ERROR);
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function fundingDestination($params): array
@@ -368,7 +368,7 @@ public function fundingDestination($params): array
         $JSONPayload = '';
         $type = 'PRIVATE';
 
-        return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
+        return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
     }
 
     public function setCredentials($key, $secret): static

BitsoAPI/Client.php

@@ -76,7 +76,7 @@ public static function checkAndDecode($result)
 
 
     // All the other API methods...
-    public static function getData($path, $RequestPath, $HTTPMethod, $JSONPayload = '', Bitso $instance): array
+    public static function getData(Bitso $instance, $path, $RequestPath, $HTTPMethod, $JSONPayload = ''): array
     {
         $nonce = self::makeNonce();
         $message = $nonce . $HTTPMethod . $RequestPath . $JSONPayload;