From 769e1c19acfc0f0c9f2fa32c0b865bf3751775a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Wi=C4=99cek?= <gitzzz14@gmail.com>
Date: Wed, 26 Apr 2023 13:59:35 +0200
Subject: [PATCH] Refactor DirectBilling and SMS Traits to use string type for
 serviceId and transactionId parameters

---
 composer.json                                  | 2 +-
 lib/DirectBilling/Traits/CalculateTrait.php    | 2 +-
 lib/DirectBilling/Traits/ServicesTrait.php     | 2 +-
 lib/DirectBilling/Traits/TransactionsTrait.php | 4 ++--
 lib/Sms/Traits/ServicesTrait.php               | 8 ++++----
 lib/Sms/Traits/TransactionsTrait.php           | 4 ++--
 lib/composer.json                              | 0
 7 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 lib/composer.json

diff --git a/composer.json b/composer.json
index 9a65a6d..6fff131 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "simpaypl/simpay",
   "description": "Official SimPay API",
   "type": "library",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "license": "MIT",
   "minimum-stability": "stable",
   "require": {
diff --git a/lib/DirectBilling/Traits/CalculateTrait.php b/lib/DirectBilling/Traits/CalculateTrait.php
index d5ec67c..12b9ded 100644
--- a/lib/DirectBilling/Traits/CalculateTrait.php
+++ b/lib/DirectBilling/Traits/CalculateTrait.php
@@ -7,7 +7,7 @@ trait CalculateTrait
     /**
      * @return mixed
      */
-    public function calculate(int $serviceId, float $amount)
+    public function calculate(string $serviceId, float $amount)
     {
         return $this->guzzle->request('GET', '/directbilling/'.$serviceId.'/calculate', [
             'amount' => $amount,
diff --git a/lib/DirectBilling/Traits/ServicesTrait.php b/lib/DirectBilling/Traits/ServicesTrait.php
index 2ed0d3e..b1968b4 100644
--- a/lib/DirectBilling/Traits/ServicesTrait.php
+++ b/lib/DirectBilling/Traits/ServicesTrait.php
@@ -18,7 +18,7 @@ public function getServices(int $page = 1, int $limit = 15)
     /**
      * @return mixed
      */
-    public function getService(int $serviceId)
+    public function getService(string $serviceId)
     {
         return $this->guzzle->request('GET', '/directbilling/'.$serviceId);
     }
diff --git a/lib/DirectBilling/Traits/TransactionsTrait.php b/lib/DirectBilling/Traits/TransactionsTrait.php
index f87b9a5..cb72d7d 100644
--- a/lib/DirectBilling/Traits/TransactionsTrait.php
+++ b/lib/DirectBilling/Traits/TransactionsTrait.php
@@ -7,7 +7,7 @@ trait TransactionsTrait
     /**
      * @return mixed
      */
-    public function getTransactions(int $serviceId, int $page = 1, int $limit = 15)
+    public function getTransactions(string $serviceId, int $page = 1, int $limit = 15)
     {
         return $this->guzzle->request('GET', '/directbilling/'.$serviceId.'/transactions', [
             'page' => $page,
@@ -18,7 +18,7 @@ public function getTransactions(int $serviceId, int $page = 1, int $limit = 15)
     /**
      * @return mixed
      */
-    public function getTransaction(int $serviceId, string $transactionId)
+    public function getTransaction(string $serviceId, string $transactionId)
     {
         return $this->guzzle->request('GET', '/directbilling/'.$serviceId.'/transactions/'.$transactionId);
     }
diff --git a/lib/Sms/Traits/ServicesTrait.php b/lib/Sms/Traits/ServicesTrait.php
index 6e4ada1..245ffa8 100644
--- a/lib/Sms/Traits/ServicesTrait.php
+++ b/lib/Sms/Traits/ServicesTrait.php
@@ -18,7 +18,7 @@ public function getServices(int $page = 1, int $limit = 15)
     /**
      * @return mixed
      */
-    public function getService(int $serviceId)
+    public function getService(string $serviceId)
     {
         return $this->guzzle->request('GET', '/sms/'.$serviceId);
     }
@@ -26,7 +26,7 @@ public function getService(int $serviceId)
     /**
      * @return mixed
      */
-    public function getServiceNumbers(int $serviceId, int $page = 1, int $limit = 15)
+    public function getServiceNumbers(string $serviceId, int $page = 1, int $limit = 15)
     {
         return $this->guzzle->request('GET', '/sms/'.$serviceId.'/numbers', [
             'page' => $page,
@@ -37,7 +37,7 @@ public function getServiceNumbers(int $serviceId, int $page = 1, int $limit = 15
     /**
      * @return mixed
      */
-    public function getServiceNumber(int $serviceId, int $number)
+    public function getServiceNumber(string $serviceId, int $number)
     {
         return $this->guzzle->request('GET', '/sms/'.$serviceId.'/numbers/'.$number);
     }
@@ -45,7 +45,7 @@ public function getServiceNumber(int $serviceId, int $number)
     /**
      * @return mixed
      */
-    public function getSmsCode(int $serviceId, string $code, int $number = null)
+    public function getSmsCode(string $serviceId, string $code, int $number = null)
     {
         return $this->guzzle->request('POST', '/sms/'.$serviceId, [
             'code' => $code,
diff --git a/lib/Sms/Traits/TransactionsTrait.php b/lib/Sms/Traits/TransactionsTrait.php
index b9f41c3..c96be2f 100644
--- a/lib/Sms/Traits/TransactionsTrait.php
+++ b/lib/Sms/Traits/TransactionsTrait.php
@@ -7,7 +7,7 @@ trait TransactionsTrait
     /**
      * @return mixed
      */
-    public function getTransactions(int $serviceId, int $page = 1, int $limit = 15)
+    public function getTransactions(string $serviceId, int $page = 1, int $limit = 15)
     {
         return $this->guzzle->request('GET', '/sms/'.$serviceId.'/transactions', [
             'page' => $page,
@@ -18,7 +18,7 @@ public function getTransactions(int $serviceId, int $page = 1, int $limit = 15)
     /**
      * @return mixed
      */
-    public function getTransaction(int $serviceId, int $transactionId)
+    public function getTransaction(string $serviceId, int $transactionId)
     {
         return $this->guzzle->request('GET', '/sms/'.$serviceId.'/transactions/'.$transactionId);
     }
diff --git a/lib/composer.json b/lib/composer.json
deleted file mode 100644
index e69de29..0000000