Skip to content

Commit b5fe565

Browse files
ziimkziimk
authored
Merge pull request #45 from pipedrive/GRAL-2093-camel-case
GRAL-2093: make sure all response properties are camelCased
2 parents 28e5624 + d77649a commit b5fe565

18 files changed

+133
-83
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Or simply add it to your composer.json dependences and run `composer update`:
1919

2020
```json
2121
"require": {
22-
"pipedrive/pipedrive": "^2.0"
22+
"pipedrive/pipedrive": "^3.0"
2323
}
2424
```
2525

‎src/Controllers/BaseController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class BaseController
2424
* User-agent to be sent with API calls
2525
* @var string
2626
*/
27-
const USER_AGENT = 'Pipedrive-SDK-PHP-1.0.0';
27+
const USER_AGENT = 'Pipedrive-SDK-PHP-3.0.0';
2828

2929
/**
3030
* HttpCallBack instance associated with this controller

‎src/Controllers/CurrenciesController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Pipedrive\Http\HttpContext;
1919
use Pipedrive\OAuthManager;
2020
use Pipedrive\Servers;
21+
use Pipedrive\Utils\CamelCaseHelper;
2122
use Unirest\Request;
2223

2324
/**
@@ -98,6 +99,6 @@ public function getAllSupportedCurrencies(
9899

99100
$mapper = $this->getJsonMapper();
100101

101-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\Currencies');
102+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\Currencies'));
102103
}
103104
}

‎src/Controllers/DealsController.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function deleteMultipleDealsInBulk(
9898

9999
$mapper = $this->getJsonMapper();
100100

101-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteMultipleDeals');
101+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteMultipleDeals'));
102102
}
103103

104104
/**
@@ -176,7 +176,7 @@ public function getAllDeals(
176176

177177
$mapper = $this->getJsonMapper();
178178

179-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeals');
179+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeals'));
180180
}
181181

182182
/**
@@ -235,7 +235,7 @@ public function addADeal(
235235

236236
$mapper = $this->getJsonMapper();
237237

238-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal');
238+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal'));
239239
}
240240

241241
/**
@@ -301,7 +301,7 @@ public function getDealsSummary(
301301

302302
$mapper = $this->getJsonMapper();
303303

304-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsSummary');
304+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsSummary'));
305305
}
306306

307307
/**
@@ -393,7 +393,7 @@ public function getDealsTimeline(
393393

394394
$mapper = $this->getJsonMapper();
395395

396-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsTimeline');
396+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDealsTimeline'));
397397
}
398398

399399
/**
@@ -449,7 +449,7 @@ public function deleteADeal(
449449

450450
$mapper = $this->getJsonMapper();
451451

452-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDeal');
452+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDeal'));
453453
}
454454

455455
/**
@@ -510,7 +510,7 @@ public function getDetailsOfADeal(
510510

511511
$mapper = $this->getJsonMapper();
512512

513-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeal');
513+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeal'));
514514
}
515515

516516
/**
@@ -607,7 +607,7 @@ public function updateADeal(
607607

608608
$mapper = $this->getJsonMapper();
609609

610-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal');
610+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddedDeal'));
611611
}
612612

613613
/**
@@ -730,7 +730,7 @@ public function createDuplicateDeal(
730730

731731
$mapper = $this->getJsonMapper();
732732

733-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDuplicatedDeal');
733+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDuplicatedDeal'));
734734
}
735735

736736
/**
@@ -980,7 +980,7 @@ public function addAFollowerToADeal(
980980

981981
$mapper = $this->getJsonMapper();
982982

983-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\AddedDealFollower');
983+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\AddedDealFollower'));
984984
}
985985

986986
/**
@@ -1039,7 +1039,7 @@ public function deleteAFollowerFromADeal(
10391039

10401040
$mapper = $this->getJsonMapper();
10411041

1042-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealFollower');
1042+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealFollower'));
10431043
}
10441044

10451045
/**
@@ -1166,7 +1166,7 @@ public function updateMergeTwoDeals(
11661166

11671167
$mapper = $this->getJsonMapper();
11681168

1169-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetMergedDeal');
1169+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetMergedDeal'));
11701170
}
11711171

11721172
/**
@@ -1347,7 +1347,7 @@ public function deleteAParticipantFromADeal(
13471347

13481348
$mapper = $this->getJsonMapper();
13491349

1350-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealParticipant');
1350+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealParticipant'));
13511351
}
13521352

13531353
/**
@@ -1590,7 +1590,7 @@ public function addAProductToTheDealEventuallyCreatingANewItemCalledADealProduct
15901590

15911591
$mapper = $this->getJsonMapper();
15921592

1593-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddProductAttachementDetails');
1593+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetAddProductAttachementDetails'));
15941594
}
15951595

15961596
/**
@@ -1677,7 +1677,7 @@ public function updateProductAttachmentDetailsOfTheDealProductAProductAlreadyAtt
16771677

16781678
$mapper = $this->getJsonMapper();
16791679

1680-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetProductAttachementDetails');
1680+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetProductAttachementDetails'));
16811681
}
16821682

16831683
/**
@@ -1738,7 +1738,7 @@ public function deleteAnAttachedProductFromADeal(
17381738

17391739
$mapper = $this->getJsonMapper();
17401740

1741-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealProduct');
1741+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteDealProduct'));
17421742
}
17431743

17441744
/**

‎src/Controllers/GlobalMessagesController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Pipedrive\Http\HttpContext;
1919
use Pipedrive\OAuthManager;
2020
use Pipedrive\Servers;
21+
use Pipedrive\Utils\CamelCaseHelper;
2122
use Unirest\Request;
2223

2324
/**
@@ -97,7 +98,7 @@ public function getGlobalMessages(
9798

9899
$mapper = $this->getJsonMapper();
99100

100-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageGet');
101+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageGet'));
101102
}
102103

103104
/**
@@ -153,6 +154,6 @@ public function deleteDismissAGlobalMessage(
153154

154155
$mapper = $this->getJsonMapper();
155156

156-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageDelete');
157+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GlobalMessageDelete'));
157158
}
158159
}

‎src/Controllers/MailMessagesController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Pipedrive\Http\HttpContext;
1919
use Pipedrive\OAuthManager;
2020
use Pipedrive\Servers;
21+
use Pipedrive\Utils\CamelCaseHelper;
2122
use Unirest\Request;
2223

2324
/**
@@ -39,7 +40,7 @@ public static function getInstance()
3940
if (null === static::$instance) {
4041
static::$instance = new static();
4142
}
42-
43+
4344
return static::$instance;
4445
}
4546

@@ -104,7 +105,7 @@ public function getOneMailMessage(
104105

105106
$mapper = $this->getJsonMapper();
106107

107-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailMessage');
108+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailMessage'));
108109
}
109110

110111

‎src/Controllers/MailThreadsController.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Pipedrive\Http\HttpContext;
1919
use Pipedrive\OAuthManager;
2020
use Pipedrive\Servers;
21+
use Pipedrive\Utils\CamelCaseHelper;
2122
use Unirest\Request;
2223

2324
/**
@@ -101,7 +102,7 @@ public function getMailThreads(
101102

102103
$mapper = $this->getJsonMapper();
103104

104-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThread');
105+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThread'));
105106
}
106107

107108
/**
@@ -157,7 +158,7 @@ public function deleteMailThread(
157158

158159
$mapper = $this->getJsonMapper();
159160

160-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadDelete');
161+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadDelete'));
161162
}
162163

163164
/**
@@ -213,7 +214,7 @@ public function getOneMailThread(
213214

214215
$mapper = $this->getJsonMapper();
215216

216-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadOne');
217+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadOne'));
217218
}
218219

219220
/**
@@ -282,7 +283,7 @@ public function updateMailThreadDetails(
282283

283284
$mapper = $this->getJsonMapper();
284285

285-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadPut');
286+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadPut'));
286287
}
287288

288289
/**
@@ -338,7 +339,7 @@ public function getAllMailMessagesOfMailThread(
338339

339340
$mapper = $this->getJsonMapper();
340341

341-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadMessages');
342+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\MailThreadMessages'));
342343
}
343344

344345

‎src/Controllers/NotesController.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Pipedrive\Http\HttpContext;
2020
use Pipedrive\OAuthManager;
2121
use Pipedrive\Servers;
22+
use Pipedrive\Utils\CamelCaseHelper;
2223
use Unirest\Request;
2324

2425
/**
@@ -140,7 +141,7 @@ public function getAllNotes(
140141

141142
$mapper = $this->getJsonMapper();
142143

143-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\GetNotes');
144+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetNotes'));
144145
}
145146

146147
/**
@@ -226,7 +227,7 @@ public function addANote(
226227

227228
$mapper = $this->getJsonMapper();
228229

229-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
230+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
230231
}
231232

232233
/**
@@ -282,7 +283,7 @@ public function deleteANote(
282283

283284
$mapper = $this->getJsonMapper();
284285

285-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteNote');
286+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\DeleteNote'));
286287
}
287288

288289
/**
@@ -338,7 +339,7 @@ public function getOneNote(
338339

339340
$mapper = $this->getJsonMapper();
340341

341-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
342+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
342343
}
343344

344345
/**
@@ -430,7 +431,7 @@ public function updateANote(
430431

431432
$mapper = $this->getJsonMapper();
432433

433-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote');
434+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PostNote'));
434435
}
435436

436437

‎src/Controllers/PermissionSetsController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Pipedrive\Http\HttpContext;
1919
use Pipedrive\OAuthManager;
2020
use Pipedrive\Servers;
21+
use Pipedrive\Utils\CamelCaseHelper;
2122
use Unirest\Request;
2223

2324
/**
@@ -94,7 +95,7 @@ public function getAllPermissionSets()
9495

9596
$mapper = $this->getJsonMapper();
9697

97-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\PermissionSets');
98+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\PermissionSets'));
9899
}
99100

100101
/**
@@ -155,7 +156,7 @@ public function getOnePermissionSet(
155156

156157
$mapper = $this->getJsonMapper();
157158

158-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\SinglePermissionSetsItem');
159+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\SinglePermissionSetsItem'));
159160
}
160161

161162
/**
@@ -225,7 +226,7 @@ public function listPermissionSetAssignments(
225226

226227
$mapper = $this->getJsonMapper();
227228

228-
return $mapper->mapClass($response->body, 'Pipedrive\\Models\\UserAssignmentsToPermissionSet');
229+
return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\UserAssignmentsToPermissionSet'));
229230
}
230231

231232

0 commit comments

Comments
 (0)