Merge pull request #45 from pipedrive/GRAL-2093-camel-case

GRAL-2093: make sure all response properties are camelCased
pipedrive · Aug 2, 2021 · b5fe565 · b5fe565
2 parents 28e5624 + d77649a
commit b5fe565
Show file tree

Hide file tree

Showing 18 changed files with 133 additions and 83 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Or simply add it to your composer.json dependences and run `composer update`:
 
 ```json
 "require": {
-    "pipedrive/pipedrive": "^2.0"
+    "pipedrive/pipedrive": "^3.0"
 }
 ```
 

diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -24,7 +24,7 @@ class BaseController
      * User-agent to be sent with API calls
      * @var string
      */
-    const USER_AGENT = 'Pipedrive-SDK-PHP-1.0.0';
+    const USER_AGENT = 'Pipedrive-SDK-PHP-3.0.0';
 
     /**
      * HttpCallBack instance associated with this controller

diff --git a/src/Controllers/CurrenciesController.php b/src/Controllers/CurrenciesController.php
@@ -18,6 +18,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -98,6 +99,6 @@ public function getAllSupportedCurrencies(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\Currencies');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\Currencies'));
     }
 }
diff --git a/src/Controllers/DealsController.php b/src/Controllers/DealsController.php
@@ -98,7 +98,7 @@ public function deleteMultipleDealsInBulk(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteMultipleDeals');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteMultipleDeals'));
     }
 
     /**
@@ -176,7 +176,7 @@ public function getAllDeals(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeals');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeals'));
     }
 
     /**
@@ -235,7 +235,7 @@ public function addADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal'));
     }
 
     /**
@@ -301,7 +301,7 @@ public function getDealsSummary(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsSummary');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsSummary'));
     }
 
     /**
@@ -393,7 +393,7 @@ public function getDealsTimeline(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsTimeline');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsTimeline'));
     }
 
     /**
@@ -449,7 +449,7 @@ public function deleteADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDeal'));
     }
 
     /**
@@ -510,7 +510,7 @@ public function getDetailsOfADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeal'));
     }
 
     /**
@@ -607,7 +607,7 @@ public function updateADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal'));
     }
 
     /**
@@ -730,7 +730,7 @@ public function createDuplicateDeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDuplicatedDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDuplicatedDeal'));
     }
 
     /**
@@ -980,7 +980,7 @@ public function addAFollowerToADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\AddedDealFollower');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\AddedDealFollower'));
     }
 
     /**
@@ -1039,7 +1039,7 @@ public function deleteAFollowerFromADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealFollower');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealFollower'));
     }
 
     /**
@@ -1166,7 +1166,7 @@ public function updateMergeTwoDeals(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetMergedDeal');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetMergedDeal'));
     }
 
     /**
@@ -1347,7 +1347,7 @@ public function deleteAParticipantFromADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealParticipant');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealParticipant'));
     }
 
     /**
@@ -1590,7 +1590,7 @@ public function addAProductToTheDealEventuallyCreatingANewItemCalledADealProduct
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddProductAttachementDetails');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddProductAttachementDetails'));
     }
 
     /**
@@ -1677,7 +1677,7 @@ public function updateProductAttachmentDetailsOfTheDealProductAProductAlreadyAtt
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetProductAttachementDetails');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetProductAttachementDetails'));
     }
 
     /**
@@ -1738,7 +1738,7 @@ public function deleteAnAttachedProductFromADeal(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealProduct');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealProduct'));
     }
 
     /**

diff --git a/src/Controllers/GlobalMessagesController.php b/src/Controllers/GlobalMessagesController.php
@@ -18,6 +18,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -97,7 +98,7 @@ public function getGlobalMessages(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageGet');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageGet'));
     }
 
     /**
@@ -153,6 +154,6 @@ public function deleteDismissAGlobalMessage(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageDelete');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageDelete'));
     }
 }
diff --git a/src/Controllers/MailMessagesController.php b/src/Controllers/MailMessagesController.php
@@ -18,6 +18,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -39,7 +40,7 @@ public static function getInstance()
         if (null === static::$instance) {
             static::$instance = new static();
         }
-        
+
         return static::$instance;
     }
 
@@ -104,7 +105,7 @@ public function getOneMailMessage(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailMessage');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailMessage'));
     }
 
 

diff --git a/src/Controllers/MailThreadsController.php b/src/Controllers/MailThreadsController.php
@@ -18,6 +18,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -101,7 +102,7 @@ public function getMailThreads(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThread');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThread'));
     }
 
     /**
@@ -157,7 +158,7 @@ public function deleteMailThread(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadDelete');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadDelete'));
     }
 
     /**
@@ -213,7 +214,7 @@ public function getOneMailThread(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadOne');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadOne'));
     }
 
     /**
@@ -282,7 +283,7 @@ public function updateMailThreadDetails(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadPut');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadPut'));
     }
 
     /**
@@ -338,7 +339,7 @@ public function getAllMailMessagesOfMailThread(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadMessages');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadMessages'));
     }
 
 

diff --git a/src/Controllers/NotesController.php b/src/Controllers/NotesController.php
@@ -19,6 +19,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -140,7 +141,7 @@ public function getAllNotes(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetNotes');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetNotes'));
     }
 
     /**
@@ -226,7 +227,7 @@ public function addANote(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
     }
 
     /**
@@ -282,7 +283,7 @@ public function deleteANote(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteNote');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteNote'));
     }
 
     /**
@@ -338,7 +339,7 @@ public function getOneNote(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
     }
 
     /**
@@ -430,7 +431,7 @@ public function updateANote(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
     }
 
 

diff --git a/src/Controllers/PermissionSetsController.php b/src/Controllers/PermissionSetsController.php
@@ -18,6 +18,7 @@
 use Pipedrive\Http\HttpContext;
 use Pipedrive\OAuthManager;
 use Pipedrive\Servers;
+use Pipedrive\Utils\CamelCaseHelper;
 use Unirest\Request;
 
 /**
@@ -94,7 +95,7 @@ public function getAllPermissionSets()
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PermissionSets');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PermissionSets'));
     }
 
     /**
@@ -155,7 +156,7 @@ public function getOnePermissionSet(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\SinglePermissionSetsItem');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\SinglePermissionSetsItem'));
     }
 
     /**
@@ -225,7 +226,7 @@ public function listPermissionSetAssignments(
 
         $mapper = $this->getJsonMapper();
 
-        return $mapper->mapClass($response->body, 'Pipedrive\\Models\\UserAssignmentsToPermissionSet');
+        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\UserAssignmentsToPermissionSet'));
     }