From ec57019fe95a388f0af2e1bf8b5fcc7b545d5d86 Mon Sep 17 00:00:00 2001 From: Artur Fursa Date: Thu, 24 Sep 2015 22:22:08 -0400 Subject: [PATCH] Applied fixes from StyleCI --- Basecamp/Api/AbstractApi.php | 13 +++---- Basecamp/Api/Accesses.php | 29 +++++++-------- Basecamp/Api/Attachments.php | 11 +++--- Basecamp/Api/Calendars.php | 15 ++++---- Basecamp/Api/CalendarsEvents.php | 61 ++++++++++++++++---------------- Basecamp/Api/Comments.php | 19 +++++----- Basecamp/Api/Documents.php | 27 +++++++------- Basecamp/Api/Events.php | 25 ++++++------- Basecamp/Api/Messages.php | 23 ++++++------ Basecamp/Api/People.php | 9 ++--- Basecamp/Api/Projects.php | 13 +++---- Basecamp/Api/Stars.php | 9 ++--- Basecamp/Api/Todolists.php | 35 +++++++++--------- Basecamp/Api/Todos.php | 25 ++++++------- Basecamp/Api/Topics.php | 17 ++++----- Basecamp/Api/Uploads.php | 11 +++--- Basecamp/Client.php | 22 ++++++------ 17 files changed, 191 insertions(+), 173 deletions(-) diff --git a/Basecamp/Api/AbstractApi.php b/Basecamp/Api/AbstractApi.php index 3c9fc98..4cfdf92 100644 --- a/Basecamp/Api/AbstractApi.php +++ b/Basecamp/Api/AbstractApi.php @@ -1,4 +1,5 @@ request(Request::METHOD_GET, $resource); @@ -54,9 +55,9 @@ final protected function delete($resource) private function request($method, $resource, $params = []) { - $message = new Request($method, $resource, self::BASE_URL . $this->client->getAccountData()['accountId'] . self::API_VERSION); + $message = new Request($method, $resource, self::BASE_URL.$this->client->getAccountData()['accountId'].self::API_VERSION); $message->setHeaders([ - 'User-Agent: ' . $this->client->getAccountData()['appName'], + 'User-Agent: '.$this->client->getAccountData()['appName'], 'Content-Type: application/json', ]); @@ -75,9 +76,9 @@ private function request($method, $resource, $params = []) $bc->setTimeout($this->timeout); if (!empty($this->client->getAccountData()['login']) && !empty($this->client->getAccountData()['password'])) { - $bc->setOption(CURLOPT_USERPWD, $this->client->getAccountData()['login'] . ':' . $this->client->getAccountData()['password']); + $bc->setOption(CURLOPT_USERPWD, $this->client->getAccountData()['login'].':'.$this->client->getAccountData()['password']); } elseif (!empty($this->client->getAccountData()['token'])) { - $message->addHeader('Authorization: Bearer ' . $this->client->getAccountData()['token']); + $message->addHeader('Authorization: Bearer '.$this->client->getAccountData()['token']); } $bc->send($message, $response); @@ -107,7 +108,7 @@ private function request($method, $resource, $params = []) $data->message = '415 Unsupported Media Type'; break; case 429: - $data->message = '429 Too Many Requests. ' . $response->getHeader('Retry-After'); + $data->message = '429 Too Many Requests. '.$response->getHeader('Retry-After'); break; case 500: $data->message = '500 Hmm, that isn’t right'; diff --git a/Basecamp/Api/Accesses.php b/Basecamp/Api/Accesses.php index d664736..9e0e779 100644 --- a/Basecamp/Api/Accesses.php +++ b/Basecamp/Api/Accesses.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/accesses.json'); + $data = $this->get('/projects/'.$projectId.'/accesses.json'); return $data; } @@ -25,14 +26,14 @@ public function project($projectId) /** * Grant access to project. * - * @param integer $projectId + * @param int $projectId * @param array $userIds * * @return object */ public function grantProject($projectId, array $userIds) { - $data = $this->post('/projects/' . $projectId . '/accesses.json', $userIds); + $data = $this->post('/projects/'.$projectId.'/accesses.json', $userIds); return $data; } @@ -40,14 +41,14 @@ public function grantProject($projectId, array $userIds) /** * Revoke access from project. * - * @param integer $projectId - * @param integer $userId + * @param int $projectId + * @param int $userId * * @return object */ public function revokeProject($projectId, $userId) { - $data = $this->delete('/projects/' . $projectId . '/accesses/' . $userId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/accesses/'.$userId.'.json'); return $data; } @@ -55,13 +56,13 @@ public function revokeProject($projectId, $userId) /** * Get accesses to calendar. * - * @param integer $calendarId + * @param int $calendarId * * @return array */ public function calendar($calendarId) { - $data = $this->get('/calendars/' . $calendarId . '/accesses.json'); + $data = $this->get('/calendars/'.$calendarId.'/accesses.json'); return $data; } @@ -69,14 +70,14 @@ public function calendar($calendarId) /** * Grant access to calendar. * - * @param integer $calendarId + * @param int $calendarId * @param array $userIds * * @return object */ public function grantCalendar($calendarId, array $userIds) { - $data = $this->post('/calendars/' . $calendarId . '/accesses.json', $userIds); + $data = $this->post('/calendars/'.$calendarId.'/accesses.json', $userIds); return $data; } @@ -84,14 +85,14 @@ public function grantCalendar($calendarId, array $userIds) /** * Revoke access from calendar. * - * @param integer $calendarId - * @param integer $userId + * @param int $calendarId + * @param int $userId * * @return object */ public function revokeCalendar($calendarId, $userId) { - $data = $this->delete('/projects/' . $calendarId . '/accesses/' . $userId . '.json'); + $data = $this->delete('/projects/'.$calendarId.'/accesses/'.$userId.'.json'); return $data; } diff --git a/Basecamp/Api/Attachments.php b/Basecamp/Api/Attachments.php index 2a007e4..37ec870 100644 --- a/Basecamp/Api/Attachments.php +++ b/Basecamp/Api/Attachments.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/attachments.json'); + $data = $this->get('/projects/'.$projectId.'/attachments.json'); return $data; } @@ -37,14 +38,14 @@ public function projectAll($projectId) /** * Get attachment. * - * @param integer $projectId - * @param integer $attachmentId + * @param int $projectId + * @param int $attachmentId * * @return object */ public function show($projectId, $attachmentId) { - $data = $this->get('GET /projects/' . $projectId . '/attachments/' . $attachmentId . '.json'); + $data = $this->get('GET /projects/'.$projectId.'/attachments/'.$attachmentId.'.json'); return $data; } diff --git a/Basecamp/Api/Calendars.php b/Basecamp/Api/Calendars.php index 414f8f9..5c512e7 100644 --- a/Basecamp/Api/Calendars.php +++ b/Basecamp/Api/Calendars.php @@ -1,4 +1,5 @@ get('/calendars/' . $calendarId . '.json'); + $data = $this->get('/calendars/'.$calendarId.'.json'); return $data; } @@ -51,14 +52,14 @@ public function create(array $params) /** * Update calendar. * - * @param integer $calendarId + * @param int $calendarId * @param array $params * * @return object */ public function update($calendarId, array $params) { - $data = $this->put('/calendars/' . $calendarId . '.json', $params); + $data = $this->put('/calendars/'.$calendarId.'.json', $params); return $data; } @@ -66,13 +67,13 @@ public function update($calendarId, array $params) /** * Delete calendar. * - * @param integer $calendarId + * @param int $calendarId * * @return object */ public function remove($calendarId) { - $data = $this->delete('/calendars/' . $calendarId . '.json'); + $data = $this->delete('/calendars/'.$calendarId.'.json'); return $data; } diff --git a/Basecamp/Api/CalendarsEvents.php b/Basecamp/Api/CalendarsEvents.php index a7afde0..be82ee2 100644 --- a/Basecamp/Api/CalendarsEvents.php +++ b/Basecamp/Api/CalendarsEvents.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/calendar_events.json'); + $data = $this->get('/projects/'.$projectId.'/calendar_events.json'); return $data; } @@ -25,13 +26,13 @@ public function projectEvents($projectId) /** * Past calendar events for the project. * - * @param integer $projectId + * @param int $projectId * * @return array */ public function projectEventsPast($projectId) { - $data = $this->get('/projects/' . $projectId . '/calendar_events/past.json'); + $data = $this->get('/projects/'.$projectId.'/calendar_events/past.json'); return $data; } @@ -39,14 +40,14 @@ public function projectEventsPast($projectId) /** * Specified project event. * - * @param integer $projectId - * @param integer $eventId + * @param int $projectId + * @param int $eventId * * @return object */ public function projectEvent($projectId, $eventId) { - $data = $this->get('/projects/' . $projectId . '/calendar_events/' . $eventId . '.json'); + $data = $this->get('/projects/'.$projectId.'/calendar_events/'.$eventId.'.json'); return $data; } @@ -54,14 +55,14 @@ public function projectEvent($projectId, $eventId) /** * New calendar event for a project. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function projectEventCreate($projectId, array $params) { - $data = $this->post('/projects/' . $projectId . '/calendar_events.json', $params); + $data = $this->post('/projects/'.$projectId.'/calendar_events.json', $params); return $data; } @@ -69,15 +70,15 @@ public function projectEventCreate($projectId, array $params) /** * Update the specific calendar event on a project. * - * @param integer $projectId - * @param integer $eventId + * @param int $projectId + * @param int $eventId * @param array $params * * @return object */ public function projectEventUpdate($projectId, $eventId, array $params) { - $data = $this->put('/projects/' . $projectId . '/calendar_events/' . $eventId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'/calendar_events/'.$eventId.'.json', $params); return $data; } @@ -85,14 +86,14 @@ public function projectEventUpdate($projectId, $eventId, array $params) /** * Delete the project event. * - * @param integer $projectId - * @param integer $eventId + * @param int $projectId + * @param int $eventId * * @return object */ public function projectEventDelete($projectId, $eventId) { - $data = $this->delete('/projects/' . $projectId . '/calendar_events/' . $eventId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/calendar_events/'.$eventId.'.json'); return $data; } @@ -100,13 +101,13 @@ public function projectEventDelete($projectId, $eventId) /** * Upcoming calendar events for the calendar. * - * @param integer $calendarId + * @param int $calendarId * * @return array */ public function calendarEvents($calendarId) { - $data = $this->get('/calendars/' . $calendarId . '/calendar_events.json'); + $data = $this->get('/calendars/'.$calendarId.'/calendar_events.json'); return $data; } @@ -114,13 +115,13 @@ public function calendarEvents($calendarId) /** * Past calendar events for the calendar. * - * @param integer $calendarId + * @param int $calendarId * * @return array */ public function calendarEventsPast($calendarId) { - $data = $this->get('/calendars/' . $calendarId . '/calendar_events/past.json'); + $data = $this->get('/calendars/'.$calendarId.'/calendar_events/past.json'); return $data; } @@ -128,14 +129,14 @@ public function calendarEventsPast($calendarId) /** * Specified calendar event. * - * @param integer $calendarId - * @param integer $eventId + * @param int $calendarId + * @param int $eventId * * @return object */ public function calendarEvent($calendarId, $eventId) { - $data = $this->get('/calendars/' . $calendarId . '/calendar_events/' . $eventId . '.json'); + $data = $this->get('/calendars/'.$calendarId.'/calendar_events/'.$eventId.'.json'); return $data; } @@ -143,14 +144,14 @@ public function calendarEvent($calendarId, $eventId) /** * New calendar event for a calendar. * - * @param integer $calendarId + * @param int $calendarId * @param array $params * * @return object */ public function calendarEventCreate($calendarId, array $params) { - $data = $this->post('/calendars/' . $calendarId . '/calendar_events.json', $params); + $data = $this->post('/calendars/'.$calendarId.'/calendar_events.json', $params); return $data; } @@ -158,15 +159,15 @@ public function calendarEventCreate($calendarId, array $params) /** * Update the specific calendar event on a calendar. * - * @param integer $calendarId - * @param integer $eventId + * @param int $calendarId + * @param int $eventId * @param array $params * * @return object */ public function calendarEventUpdate($calendarId, $eventId, array $params) { - $data = $this->put('/calendars/' . $calendarId . '/calendar_events/' . $eventId . '.json', $params); + $data = $this->put('/calendars/'.$calendarId.'/calendar_events/'.$eventId.'.json', $params); return $data; } @@ -174,14 +175,14 @@ public function calendarEventUpdate($calendarId, $eventId, array $params) /** * Delete the calendar event. * - * @param integer $calendarId - * @param integer $eventId + * @param int $calendarId + * @param int $eventId * * @return object */ public function calendarEventDelete($calendarId, $eventId) { - $data = $this->delete('/calendars/' . $calendarId . '/calendar_events/' . $eventId . '.json'); + $data = $this->delete('/calendars/'.$calendarId.'/calendar_events/'.$eventId.'.json'); return $data; } diff --git a/Basecamp/Api/Comments.php b/Basecamp/Api/Comments.php index e28b00a..213fc37 100644 --- a/Basecamp/Api/Comments.php +++ b/Basecamp/Api/Comments.php @@ -1,4 +1,5 @@ post('/projects/' . $projectId . '/messages/' . $messageId . '/comments.json', $params); + $data = $this->post('/projects/'.$projectId.'/messages/'.$messageId.'/comments.json', $params); return $data; } @@ -27,15 +28,15 @@ public function createMessageComment($projectId, $messageId, array $params) /** * New comment for todos. * - * @param integer $projectId - * @param integer $messageId + * @param int $projectId + * @param int $messageId * @param array $params * * @return object */ public function createTodoComment($projectId, $messageId, array $params) { - $data = $this->post('/projects/' . $projectId . '/todos/' . $messageId . '/comments.json', $params); + $data = $this->post('/projects/'.$projectId.'/todos/'.$messageId.'/comments.json', $params); return $data; } @@ -43,14 +44,14 @@ public function createTodoComment($projectId, $messageId, array $params) /** * Delete the comment. * - * @param integer $projectId - * @param integer $commentId + * @param int $projectId + * @param int $commentId * * @return object */ public function remove($projectId, $commentId) { - $data = $this->delete('/projects/' . $projectId . '/comments/' . $commentId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/comments/'.$commentId.'.json'); return $data; } diff --git a/Basecamp/Api/Documents.php b/Basecamp/Api/Documents.php index 3f62145..64315e1 100644 --- a/Basecamp/Api/Documents.php +++ b/Basecamp/Api/Documents.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/documents.json'); + $data = $this->get('/projects/'.$projectId.'/documents.json'); return $data; } @@ -37,14 +38,14 @@ public function allByProject($projectId) /** * Specified document. * - * @param integer $projectId - * @param integer $docId + * @param int $projectId + * @param int $docId * * @return object */ public function show($projectId, $docId) { - $data = $this->get('/projects/' . $projectId . '/documents/' . $docId . '.json'); + $data = $this->get('/projects/'.$projectId.'/documents/'.$docId.'.json'); return $data; } @@ -52,14 +53,14 @@ public function show($projectId, $docId) /** * Create a new document. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function create($projectId, array $params) { - $data = $this->post('/projects/' . $projectId . '/documents.json', $params); + $data = $this->post('/projects/'.$projectId.'/documents.json', $params); return $data; } @@ -67,15 +68,15 @@ public function create($projectId, array $params) /** * Update document. * - * @param integer $projectId - * @param integer $docId + * @param int $projectId + * @param int $docId * @param array $params * * @return object */ public function update($projectId, $docId, array $params) { - $data = $this->put('/projects/' . $projectId . '/documents/' . $docId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'/documents/'.$docId.'.json', $params); return $data; } @@ -83,14 +84,14 @@ public function update($projectId, $docId, array $params) /** * Remove document. * - * @param integer $projectId - * @param integer $docId + * @param int $projectId + * @param int $docId * * @return object */ public function remove($projectId, $docId) { - $data = $this->delete('/projects/' . $projectId . '/documents/' . $docId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/documents/'.$docId.'.json'); return $data; } diff --git a/Basecamp/Api/Events.php b/Basecamp/Api/Events.php index c09d8ff..1b9fa86 100644 --- a/Basecamp/Api/Events.php +++ b/Basecamp/Api/Events.php @@ -1,4 +1,5 @@ get('/events.json', [ 'since' => $since, - 'page' => $page, + 'page' => $page, ]); return $data; @@ -29,17 +30,17 @@ public function all($since, $page = 1) /** * Project events. * - * @param integer $projectId - * @param string $since Date and time in "2012-03-24T11:00:00-06:00" format. - * @param integer $page + * @param int $projectId + * @param string $since Date and time in "2012-03-24T11:00:00-06:00" format. + * @param int $page * * @return array */ public function allByProject($projectId, $since, $page = 1) { - $data = $this->get('/projects/' . $projectId . '/events.json', [ + $data = $this->get('/projects/'.$projectId.'/events.json', [ 'since' => $since, - 'page' => $page, + 'page' => $page, ]); return $data; @@ -48,17 +49,17 @@ public function allByProject($projectId, $since, $page = 1) /** * Person events. * - * @param integer $userId - * @param string $since Date and time in "2012-03-24T11:00:00-06:00" format. - * @param integer $page + * @param int $userId + * @param string $since Date and time in "2012-03-24T11:00:00-06:00" format. + * @param int $page * * @return array */ public function allByPerson($userId, $since, $page = 1) { - $data = $this->get('/people/' . $userId . '/events.json', [ + $data = $this->get('/people/'.$userId.'/events.json', [ 'since' => $since, - 'page' => $page, + 'page' => $page, ]); return $data; diff --git a/Basecamp/Api/Messages.php b/Basecamp/Api/Messages.php index c9fc70c..a286cd8 100644 --- a/Basecamp/Api/Messages.php +++ b/Basecamp/Api/Messages.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/messages/' . $messageId . '.json'); + $data = $this->get('/projects/'.$projectId.'/messages/'.$messageId.'.json'); return $data; } @@ -26,14 +27,14 @@ public function show($projectId, $messageId) /** * Create message. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function create($projectId, array $params) { - $data = $this->post('/projects/' . $projectId . '/messages.json', $params); + $data = $this->post('/projects/'.$projectId.'/messages.json', $params); return $data; } @@ -41,15 +42,15 @@ public function create($projectId, array $params) /** * Update message. * - * @param integer $projectId - * @param integer $messageId + * @param int $projectId + * @param int $messageId * @param array $params * * @return object */ public function update($projectId, $messageId, array $params) { - $data = $this->put('/projects/' . $projectId . '/messages/' . $messageId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'/messages/'.$messageId.'.json', $params); return $data; } @@ -57,14 +58,14 @@ public function update($projectId, $messageId, array $params) /** * Delete message. * - * @param integer $projectId - * @param integer $messageId + * @param int $projectId + * @param int $messageId * * @return object */ public function remove($projectId, $messageId) { - $data = $this->delete('/projects/' . $projectId . '/messages/' . $messageId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/messages/'.$messageId.'.json'); return $data; } diff --git a/Basecamp/Api/People.php b/Basecamp/Api/People.php index be180b5..e605caa 100644 --- a/Basecamp/Api/People.php +++ b/Basecamp/Api/People.php @@ -1,4 +1,5 @@ get('/people/' . $userId . '.json'); + $data = $this->get('/people/'.$userId.'.json'); return $data; } @@ -37,13 +38,13 @@ public function show($userId) /** * Delete person. * - * @param integer $userId + * @param int $userId * * @return object */ public function remove($userId) { - $data = $this->delete('/people/' . $userId . '.json'); + $data = $this->delete('/people/'.$userId.'.json'); return $data; } diff --git a/Basecamp/Api/Projects.php b/Basecamp/Api/Projects.php index dcc167f..e16624e 100644 --- a/Basecamp/Api/Projects.php +++ b/Basecamp/Api/Projects.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '.json'); + $data = $this->get('/projects/'.$projectId.'.json'); return $data; } @@ -63,14 +64,14 @@ public function create(array $params) /** * Update project. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function update($projectId, array $params) { - $data = $this->put('/projects/' . $projectId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'.json', $params); return $data; } @@ -78,13 +79,13 @@ public function update($projectId, array $params) /** * Delete project. * - * @param integer $projectId + * @param int $projectId * * @return object */ public function remove($projectId) { - $data = $this->delete('/projects/' . $projectId . '.json'); + $data = $this->delete('/projects/'.$projectId.'.json'); return $data; } diff --git a/Basecamp/Api/Stars.php b/Basecamp/Api/Stars.php index 38445c6..b05b7ba 100644 --- a/Basecamp/Api/Stars.php +++ b/Basecamp/Api/Stars.php @@ -1,4 +1,5 @@ post('/projects/' . $projectId . '/star.json', []); + $data = $this->post('/projects/'.$projectId.'/star.json', []); return $data; } @@ -37,13 +38,13 @@ public function star($projectId) /** * Unstar a project. * - * @param integer $projectId + * @param int $projectId * * @return object */ public function unstar($projectId) { - $data = $this->delete('/projects/' . $projectId . '/star.json'); + $data = $this->delete('/projects/'.$projectId.'/star.json'); return $data; } diff --git a/Basecamp/Api/Todolists.php b/Basecamp/Api/Todolists.php index cd656d6..c8f6bb5 100644 --- a/Basecamp/Api/Todolists.php +++ b/Basecamp/Api/Todolists.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/todolists.json'); + $data = $this->get('/projects/'.$projectId.'/todolists.json'); return $data; } @@ -49,13 +50,13 @@ public function allByProject($projectId) /** * Completed todolists for this project. * - * @param integer $projectId + * @param int $projectId * * @return array */ public function completedByProject($projectId) { - $data = $this->get('/projects/' . $projectId . '/todolists/completed.json'); + $data = $this->get('/projects/'.$projectId.'/todolists/completed.json'); return $data; } @@ -63,14 +64,14 @@ public function completedByProject($projectId) /** * Get todolist. * - * @param integer $projectId - * @param integer $todolistId + * @param int $projectId + * @param int $todolistId * * @return object */ public function show($projectId, $todolistId) { - $data = $this->get('/projects/' . $projectId . '/todolists/' . $todolistId . '.json'); + $data = $this->get('/projects/'.$projectId.'/todolists/'.$todolistId.'.json'); return $data; } @@ -78,13 +79,13 @@ public function show($projectId, $todolistId) /** * All todolists with todos assigned to the specified person. * - * @param integer $userId + * @param int $userId * * @return array */ public function assigned($userId) { - $data = $this->get('/people/' . $userId . '/assigned_todos.json'); + $data = $this->get('/people/'.$userId.'/assigned_todos.json'); return $data; } @@ -92,14 +93,14 @@ public function assigned($userId) /** * Create todolist. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function create($projectId, array $params) { - $data = $this->post('/projects/' . $projectId . '/todolists.json', $params); + $data = $this->post('/projects/'.$projectId.'/todolists.json', $params); return $data; } @@ -107,15 +108,15 @@ public function create($projectId, array $params) /** * Update todolist. * - * @param integer $projectId - * @param integer $todolistId + * @param int $projectId + * @param int $todolistId * @param array $params * * @return object */ public function update($projectId, $todolistId, array $params) { - $data = $this->put('/projects/' . $projectId . '/todolists/' . $todolistId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'/todolists/'.$todolistId.'.json', $params); return $data; } @@ -123,14 +124,14 @@ public function update($projectId, $todolistId, array $params) /** * Delete todolist. * - * @param integer $projectId - * @param integer $todolistId + * @param int $projectId + * @param int $todolistId * * @return object */ public function remove($projectId, $todolistId) { - $data = $this->delete('/projects/' . $projectId . '/todolists/' . $todolistId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/todolists/'.$todolistId.'.json'); return $data; } diff --git a/Basecamp/Api/Todos.php b/Basecamp/Api/Todos.php index 5451a7a..9ffdcb9 100644 --- a/Basecamp/Api/Todos.php +++ b/Basecamp/Api/Todos.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/todos/' . $todoId . '.json'); + $data = $this->get('/projects/'.$projectId.'/todos/'.$todoId.'.json'); return $data; } @@ -26,15 +27,15 @@ public function show($projectId, $todoId) /** * Create todo. * - * @param integer $projectId - * @param integer $todolistId + * @param int $projectId + * @param int $todolistId * @param array $params * * @return object */ public function create($projectId, $todolistId, array $params) { - $data = $this->post('/projects/' . $projectId . '/todolists/' . $todolistId . '/todos.json', $params); + $data = $this->post('/projects/'.$projectId.'/todolists/'.$todolistId.'/todos.json', $params); return $data; } @@ -42,15 +43,15 @@ public function create($projectId, $todolistId, array $params) /** * Update todo. * - * @param integer $projectId - * @param integer $todoId + * @param int $projectId + * @param int $todoId * @param array $params * * @return object */ public function update($projectId, $todoId, array $params) { - $data = $this->put('/projects/' . $projectId . '/todos/' . $todoId . '.json', $params); + $data = $this->put('/projects/'.$projectId.'/todos/'.$todoId.'.json', $params); return $data; } @@ -58,14 +59,14 @@ public function update($projectId, $todoId, array $params) /** * Delete todo. * - * @param integer $projectId - * @param integer $todoId + * @param int $projectId + * @param int $todoId * * @return object */ public function remove($projectId, $todoId) { - $data = $this->delete('/projects/' . $projectId . '/todos/' . $todoId . '.json'); + $data = $this->delete('/projects/'.$projectId.'/todos/'.$todoId.'.json'); return $data; } diff --git a/Basecamp/Api/Topics.php b/Basecamp/Api/Topics.php index de3ec9f..20e288c 100644 --- a/Basecamp/Api/Topics.php +++ b/Basecamp/Api/Topics.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/topics.json', [ + $data = $this->get('/projects/'.$projectId.'/topics.json', [ 'page' => $page, ]); @@ -42,8 +43,8 @@ public function allByProject($projectId, $page = 1) } /** - * @param integer $projectId - * @param integer $topicId + * @param int $projectId + * @param int $topicId * * @return array */ @@ -55,8 +56,8 @@ public function archive($projectId, $topicId) } /** - * @param integer $projectId - * @param integer $topicId + * @param int $projectId + * @param int $topicId * * @return array */ diff --git a/Basecamp/Api/Uploads.php b/Basecamp/Api/Uploads.php index 4d3f92f..e85d757 100644 --- a/Basecamp/Api/Uploads.php +++ b/Basecamp/Api/Uploads.php @@ -1,4 +1,5 @@ get('/projects/' . $projectId . '/uploads/' . $uploadId . '.json'); + $data = $this->get('/projects/'.$projectId.'/uploads/'.$uploadId.'.json'); return $data; } @@ -26,14 +27,14 @@ public function show($projectId, $uploadId) /** * Create uploads. * - * @param integer $projectId + * @param int $projectId * @param array $params * * @return object */ public function create($projectId, array $params) { - $data = $this->post('/projects/' . $projectId . '/uploads.json', $params); + $data = $this->post('/projects/'.$projectId.'/uploads.json', $params); return $data; } diff --git a/Basecamp/Client.php b/Basecamp/Client.php index 120d1ea..f4e3e68 100644 --- a/Basecamp/Client.php +++ b/Basecamp/Client.php @@ -1,9 +1,11 @@ - * [ - * 'accountId' => '', // Basecamp account ID - * 'appName' => '', // Application name (used as User-Agent header) - * 'token' => '', // OAuth token - * 'login' => '', // 37Signal's account login - * 'password' => '', // 37Signal's account password - * ] - * + * + * [ + * 'accountId' => '', // Basecamp account ID + * 'appName' => '', // Application name (used as User-Agent header) + * 'token' => '', // OAuth token + * 'login' => '', // 37Signal's account login + * 'password' => '', // 37Signal's account password + * ] + * */ public function __construct(array $accountData) {