code cleanup, added return of message to Exceptions

Kephson · Jul 3, 2020 · 0acb5cb · 0acb5cb
1 parent 4c3f5c4
commit 0acb5cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Exception/SalesforceAuthenticationException.php b/src/Exception/SalesforceAuthenticationException.php
@@ -20,7 +20,7 @@ public static function fromClientException(ClientException $e)
     {
         $responseString = $e->getResponse()->getBody()->getContents();
         $responseData = json_decode($responseString, true);
-        $ret = new self(self::$errorMessage, $e->getResponse()->getStatusCode());
+        $ret = new self(self::$errorMessage . ': ' . $e->getMessage(), $e->getResponse()->getStatusCode());
         $ret->setErrors($responseData);
         return $ret;
     }

diff --git a/src/Exception/SalesforceException.php b/src/Exception/SalesforceException.php
@@ -26,7 +26,7 @@ public static function fromClientException(ClientException $e)
     {
         $responseString = $e->getResponse()->getBody()->getContents();
         $responseData = json_decode($responseString, true);
-        $ret = new self(self::$errorMessage, $e->getResponse()->getStatusCode());
+        $ret = new self(self::$errorMessage . ': ' . $e->getMessage(), $e->getResponse()->getStatusCode());
         $ret->setErrors($responseData);
         return $ret;
     }

diff --git a/src/SalesforceFunctions.php b/src/SalesforceFunctions.php
@@ -15,7 +15,7 @@ class SalesforceFunctions
     /**
      * @var string
      */
-    const apiVersion = "v47.0";
+    const apiVersion = "v48.0";
 
     /**
      * @var string
@@ -30,7 +30,7 @@ class SalesforceFunctions
     /**
      * @var string
      */
-    protected $apiVersion = "v47.0";
+    protected $apiVersion = "v48.0";
 
     /**
      * SalesforceFunctions constructor.
@@ -149,7 +149,7 @@ public function retrieve($object, $field, $id)
 
         $status = $request->getStatusCode();
 
-        if ($status != 200) {
+        if ($status !== 200) {
             throw new SalesforceException(
                 "Error: call to URL {$url} failed with status {$status}, response: {$request->getReasonPhrase()}"
             );
@@ -185,7 +185,7 @@ public function create($object, $data)
             throw SalesforceException::fromClientException($e);
         }
 
-        if ($status != 201) {
+        if ($status !== 201) {
             throw new SalesforceException(
                 "Error: call to URL {$url} failed with status {$status}, response: {$request->getReasonPhrase()}"
             );
@@ -223,7 +223,7 @@ public function update($object, $id, $data)
 
         $status = $request->getStatusCode();
 
-        if ($status != 204) {
+        if ($status !== 204) {
             throw new SalesforceException(
                 "Error: call to URL {$url} failed with status {$status}, response: {$request->getReasonPhrase()}"
             );
@@ -261,7 +261,7 @@ public function upsert($object, $field, $id, $data)
 
         $status = $request->getStatusCode();
 
-        if ($status != 204 && $status != 201) {
+        if ($status !== 204 && $status !== 201) {
             throw new SalesforceException(
                 "Error: call to URL {$url} failed with status {$status}, response: {$request->getReasonPhrase()}"
             );
@@ -294,7 +294,7 @@ public function delete($object, $id)
 
         $status = $request->getStatusCode();
 
-        if ($status != 204) {
+        if ($status !== 204) {
             throw new SalesforceException(
                 "Error: call to URL {$url} failed with status {$status}, response: {$request->getReasonPhrase()}"
             );