From c2d2e369fdff05276319ce061a34061b33d0c060 Mon Sep 17 00:00:00 2001 From: turanct Date: Tue, 13 Oct 2015 09:55:46 +0200 Subject: [PATCH 1/4] Bring the lock file up-to-date with changes in composer.json --- composer.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 7991bd3..abe87a9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f3254764816f69512ac9f44151c46a31", + "hash": "0029cb4baa71523683d88358b3e74061", + "content-hash": "c6d6f7e505205a314d9c7f85eafaab70", "packages": [ { "name": "guzzlehttp/guzzle", @@ -16,7 +17,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/768b4c0e3e0712a53eb35eaf3ba0d96910225389", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6d6c3a68fbea09c50b251553d59b9209b475e272", "reference": "768b4c0e3e0712a53eb35eaf3ba0d96910225389", "shasum": "" }, @@ -440,7 +441,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f", "shasum": "" }, @@ -680,7 +681,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/73fad41adb5b7bc3a494bb930d90648df1d5e74b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00194eb95989190a73198390ceca081ad3441a7f", "reference": "73fad41adb5b7bc3a494bb930d90648df1d5e74b", "shasum": "" }, @@ -752,7 +753,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", "reference": "5e2645ad49d196e020b85598d7c97e482725786a", "shasum": "" }, @@ -1041,7 +1042,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23af31f402993cfd94e99cbc4b782e9a78eb0e97", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/80e75e39bd6895a2240f5f959a5fec2df501d339", "reference": "23af31f402993cfd94e99cbc4b782e9a78eb0e97", "shasum": "" }, @@ -1175,12 +1176,12 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "b68154f3ee23d8294936433fd31725a83bd02f71" + "url": "https://github.com/symfony/yaml.git", + "reference": "d4a6e1a210b2e84d956fe5b976d9b91a4ba8f7d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/b68154f3ee23d8294936433fd31725a83bd02f71", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d4a6e1a210b2e84d956fe5b976d9b91a4ba8f7d4", "reference": "b68154f3ee23d8294936433fd31725a83bd02f71", "shasum": "" }, @@ -1217,7 +1218,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-09-14 14:15:24" + "time": "2015-10-12 11:09:16" }, { "name": "vlucas/phpdotenv", From f25fc9d0c9e09b21e90268606d7379e51dfc58ac Mon Sep 17 00:00:00 2001 From: turanct Date: Tue, 13 Oct 2015 09:59:21 +0200 Subject: [PATCH 2/4] Style changes so CI will be contented --- src/Pinterest/Api.php | 4 ++-- src/Pinterest/Http/GuzzleClient.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Pinterest/Api.php b/src/Pinterest/Api.php index 6348561..f892a02 100644 --- a/src/Pinterest/Api.php +++ b/src/Pinterest/Api.php @@ -295,7 +295,7 @@ public function getUserInterests() /** * Follows a user. * - * @param User $user The user to follow. + * @param User $user The user to follow. * * @return Http\Response The response. */ @@ -306,7 +306,7 @@ public function followUser(User $user) } $request = new Request('POST', 'me/following/users', [ - 'user' => $user->username + 'user' => $user->username, ]); return $this->execute($request); diff --git a/src/Pinterest/Http/GuzzleClient.php b/src/Pinterest/Http/GuzzleClient.php index e9bb31d..8f690bc 100644 --- a/src/Pinterest/Http/GuzzleClient.php +++ b/src/Pinterest/Http/GuzzleClient.php @@ -75,8 +75,7 @@ public function execute(Request $request, $token) if ($request->isPost()) { $this->addTokenToHeaders($headers, $token); - } - else { + } else { $this->addToken($params, $token); } From 9691c8a28c2dc88cc6a9bc517eb9a9e72d698369 Mon Sep 17 00:00:00 2001 From: turanct Date: Tue, 13 Oct 2015 10:01:03 +0200 Subject: [PATCH 3/4] Remove unused use statement --- tests/ApiTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ApiTest.php b/tests/ApiTest.php index 46b9c1c..f9e78d0 100644 --- a/tests/ApiTest.php +++ b/tests/ApiTest.php @@ -1,7 +1,6 @@ Date: Tue, 13 Oct 2015 10:16:14 +0200 Subject: [PATCH 4/4] Fix return types in phpdocs of the Api class --- src/Pinterest/Api.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Pinterest/Api.php b/src/Pinterest/Api.php index f892a02..4780444 100644 --- a/src/Pinterest/Api.php +++ b/src/Pinterest/Api.php @@ -100,7 +100,7 @@ private function execute(Request $request, callable $processor = null) /** * Fetches a single user and processes the response. * - * @return Http\Response The response. + * @return Objects\User The User. */ private function fetchUser(Request $request) { @@ -114,7 +114,7 @@ private function fetchUser(Request $request) /** * Fetches a single board and processes the response. * - * @return Http\Response The response. + * @return Objects\Board The Board. */ private function fetchBoard(Request $request) { @@ -128,7 +128,7 @@ private function fetchBoard(Request $request) /** * Fetches multiple boards and processes the response. * - * @return Http\Response The response. + * @return PagedList[Objects\Board] A list of Boards. */ private function fetchMultipleBoards(Request $request) { @@ -142,7 +142,7 @@ private function fetchMultipleBoards(Request $request) /** * Fetches multiple users and processes the response. * - * @return Http\Response The response. + * @return PagedList[Objects\User] A list of Users. */ private function fetchMultipleUsers(Request $request) { @@ -156,7 +156,7 @@ private function fetchMultipleUsers(Request $request) /** * Fetches multiple boards and processes the response. * - * @return Http\Response The response. + * @return PagedList[Objects\Pin] A list of Pins. */ private function fetchMultiplePins(Request $request) { @@ -172,7 +172,7 @@ private function fetchMultiplePins(Request $request) * * @param $usernameOrId string The username or identifier of the user. * - * @return Http\Response The response. + * @return Objects\User The User. */ public function getUser($usernameOrId) { @@ -187,7 +187,7 @@ public function getUser($usernameOrId) * * @param string $id The board identifier. * - * @return Http\Response The response. + * @return Objects\Board The Board. */ public function getBoard($id) { @@ -199,7 +199,7 @@ public function getBoard($id) /** * Returns the boards of the authenticated user. * - * @return Http\Response The response. + * @return PagedList[Objects\Board] A list of Boards. */ public function getUserBoards() { @@ -211,7 +211,7 @@ public function getUserBoards() /** * Returns the pins of the authenticated user. * - * @return Http\Response The response. + * @return PagedList[Objects\Pin] A list of Likes. */ public function getUserLikes() { @@ -223,7 +223,7 @@ public function getUserLikes() /** * Returns the pins of the authenticated user. * - * @return Http\Response The response. + * @return PagedList[Objects\Pin] A list of Pins. */ public function getUserPins() { @@ -235,7 +235,7 @@ public function getUserPins() /** * Returns the authenticated user. * - * @return Http\Response The response. + * @return Objects\User The current User. */ public function getCurrentUser() { @@ -247,7 +247,7 @@ public function getCurrentUser() /** * Returns the followers of the authenticated user. * - * @return Http\Response The response. + * @return PagedList[Objects\User] The current User's followers. */ public function getUserFollowers() { @@ -259,7 +259,7 @@ public function getUserFollowers() /** * Returns the boards that the authenticated user follows. * - * @return Http\Response The response. + * @return PagedList[Objects\Board] The Boards the current user follows. */ public function getUserFollowingBoards() { @@ -271,7 +271,7 @@ public function getUserFollowingBoards() /** * Returns the users that the authenticated user follows. * - * @return Http\Response The response. + * @return PagedList[Objects\User] A list of users. */ public function getUserFollowing() { @@ -283,7 +283,7 @@ public function getUserFollowing() /** * Returns the interests (pins) that the authenticated user follows. * - * @return Http\Response The response. + * @return PagedList[Objects\Pin] The current User's interests. */ public function getUserInterests() {