From e7e71e5f6c29a757e110ca8836ff75a92895ec9c Mon Sep 17 00:00:00 2001 From: Vidhan Bhonsle Date: Sat, 19 Nov 2022 00:17:51 +0530 Subject: [PATCH 1/3] issue_73 --- lib/ApiOperations/Request.php | 3 +++ lib/ApiOperations/Update.php | 1 + lib/ApiRequestor.php | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ApiOperations/Request.php b/lib/ApiOperations/Request.php index 29459ca..19e3571 100644 --- a/lib/ApiOperations/Request.php +++ b/lib/ApiOperations/Request.php @@ -54,8 +54,11 @@ protected static function _staticRequest($method, $url, $params, $options) $opts = \Telnyx\Util\RequestOptions::parse($options); $baseUrl = isset($opts->apiBase) ? $opts->apiBase : static::baseUrl(); $requestor = new \Telnyx\ApiRequestor($opts->apiKey, $baseUrl); + list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers); + $opts->discardNonPersistentHeaders(); + return [$response, $opts]; } } diff --git a/lib/ApiOperations/Update.php b/lib/ApiOperations/Update.php index 079d036..bb14432 100644 --- a/lib/ApiOperations/Update.php +++ b/lib/ApiOperations/Update.php @@ -24,6 +24,7 @@ public static function update($id, $params = null, $opts = null) list($response, $opts) = static::_staticRequest('patch', $url, $params, $opts); $obj = \Telnyx\Util\Util::convertToTelnyxObject($response->json, $opts); + $obj->setLastResponse($response); return $obj; } diff --git a/lib/ApiRequestor.php b/lib/ApiRequestor.php index b120811..578ff84 100644 --- a/lib/ApiRequestor.php +++ b/lib/ApiRequestor.php @@ -80,9 +80,9 @@ private static function _encodeObjects($d) if ($d instanceof ApiResource) { return Util\Util::utf8($d->id); } elseif ($d === true) { - return 'true'; + return true; } elseif ($d === false) { - return 'false'; + return false; } elseif (is_array($d)) { $res = []; foreach ($d as $k => $v) { @@ -109,7 +109,9 @@ public function request($method, $url, $params = null, $headers = null) $params = $params ?: []; $headers = $headers ?: []; list($rbody, $rcode, $rheaders, $myApiKey) = $this->_requestRaw($method, $url, $params, $headers); + print_r($rbody); die; $json = $this->_interpretResponse($rbody, $rcode, $rheaders); + $resp = new ApiResponse($rbody, $rcode, $rheaders, $json); return [$resp, $myApiKey]; From 7390ed4b2b88851eeccdcb52d87c2e8f8d08fd1a Mon Sep 17 00:00:00 2001 From: Vidhan Bhonsle Date: Sat, 19 Nov 2022 01:20:37 +0530 Subject: [PATCH 2/3] Issue 73 --- lib/ApiRequestor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ApiRequestor.php b/lib/ApiRequestor.php index b120811..df0310f 100644 --- a/lib/ApiRequestor.php +++ b/lib/ApiRequestor.php @@ -80,9 +80,9 @@ private static function _encodeObjects($d) if ($d instanceof ApiResource) { return Util\Util::utf8($d->id); } elseif ($d === true) { - return 'true'; + return true; } elseif ($d === false) { - return 'false'; + return false; } elseif (is_array($d)) { $res = []; foreach ($d as $k => $v) { From d63631116e357df2f933a0f56ebf9cd7248a3eff Mon Sep 17 00:00:00 2001 From: vionash <61507189+vionash@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:30:31 -0600 Subject: [PATCH 3/3] Update ApiRequestor.php Delete print --- lib/ApiRequestor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ApiRequestor.php b/lib/ApiRequestor.php index 578ff84..01db015 100644 --- a/lib/ApiRequestor.php +++ b/lib/ApiRequestor.php @@ -109,7 +109,7 @@ public function request($method, $url, $params = null, $headers = null) $params = $params ?: []; $headers = $headers ?: []; list($rbody, $rcode, $rheaders, $myApiKey) = $this->_requestRaw($method, $url, $params, $headers); - print_r($rbody); die; + $json = $this->_interpretResponse($rbody, $rcode, $rheaders); $resp = new ApiResponse($rbody, $rcode, $rheaders, $json);