From 06405d00673992ac80f6add2e06bf1867675ffb1 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Sat, 11 Jan 2020 19:32:35 +0000 Subject: [PATCH] Apply fixes from StyleCI --- lib/Github/Api/AbstractApi.php | 4 +--- lib/Github/Api/GitData/Blobs.php | 4 +--- lib/Github/Api/PullRequest/Review.php | 2 +- lib/Github/Api/Repository/Assets.php | 4 +--- lib/Github/Api/Repository/Contents.php | 14 +++++++------- test/Github/Tests/Api/IssueTest.php | 4 ++-- test/Github/Tests/Api/PullRequest/CommentsTest.php | 2 +- test/Github/Tests/Functional/CacheTest.php | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/lib/Github/Api/AbstractApi.php b/lib/Github/Api/AbstractApi.php index 492e44ca4d8..a9204787659 100644 --- a/lib/Github/Api/AbstractApi.php +++ b/lib/Github/Api/AbstractApi.php @@ -126,9 +126,7 @@ protected function head($path, array $parameters = [], array $requestHeaders = [ unset($parameters['ref']); } - $response = $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters), $requestHeaders); - - return $response; + return $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters), $requestHeaders); } /** diff --git a/lib/Github/Api/GitData/Blobs.php b/lib/Github/Api/GitData/Blobs.php index be68771d9bd..c6269e86663 100644 --- a/lib/Github/Api/GitData/Blobs.php +++ b/lib/Github/Api/GitData/Blobs.php @@ -43,9 +43,7 @@ public function configure($bodyType = null) */ public function show($username, $repository, $sha) { - $response = $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/git/blobs/'.rawurlencode($sha)); - - return $response; + return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/git/blobs/'.rawurlencode($sha)); } /** diff --git a/lib/Github/Api/PullRequest/Review.php b/lib/Github/Api/PullRequest/Review.php index e53f7179a19..f984deab1e5 100644 --- a/lib/Github/Api/PullRequest/Review.php +++ b/lib/Github/Api/PullRequest/Review.php @@ -171,7 +171,7 @@ public function dismiss($username, $repository, $pullRequest, $id, $message) } return $this->put('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.$pullRequest.'/reviews/'.$id.'/dismissals', [ - 'message' => $message, + 'message' => $message, ]); } diff --git a/lib/Github/Api/Repository/Assets.php b/lib/Github/Api/Repository/Assets.php index dbe6da2251a..899b2db34c0 100644 --- a/lib/Github/Api/Repository/Assets.php +++ b/lib/Github/Api/Repository/Assets.php @@ -74,9 +74,7 @@ public function create($username, $repository, $id, $name, $contentType, $conten // Asset creation requires a separate endpoint, uploads.github.com. // Change the base url for the HTTP client temporarily while we execute // this request. - $response = $this->postRaw('https://uploads.github.com/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/releases/'.rawurlencode($id).'/assets?name='.$name, $content, ['Content-Type' => $contentType]); - - return $response; + return $this->postRaw('https://uploads.github.com/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/releases/'.rawurlencode($id).'/assets?name='.$name, $content, ['Content-Type' => $contentType]); } /** diff --git a/lib/Github/Api/Repository/Contents.php b/lib/Github/Api/Repository/Contents.php index 631fff2c7ba..2cd11ddbc6f 100644 --- a/lib/Github/Api/Repository/Contents.php +++ b/lib/Github/Api/Repository/Contents.php @@ -102,8 +102,8 @@ public function create($username, $repository, $path, $content, $message, $branc $url = '/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents/'.rawurlencode($path); $parameters = [ - 'content' => base64_encode($content), - 'message' => $message, + 'content' => base64_encode($content), + 'message' => $message, ]; if (null !== $branch) { @@ -178,9 +178,9 @@ public function update($username, $repository, $path, $content, $message, $sha, $url = '/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents/'.rawurlencode($path); $parameters = [ - 'content' => base64_encode($content), - 'message' => $message, - 'sha' => $sha, + 'content' => base64_encode($content), + 'message' => $message, + 'sha' => $sha, ]; if (null !== $branch) { @@ -219,8 +219,8 @@ public function rm($username, $repository, $path, $message, $sha, $branch = null $url = '/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents/'.rawurlencode($path); $parameters = [ - 'message' => $message, - 'sha' => $sha, + 'message' => $message, + 'sha' => $sha, ]; if (null !== $branch) { diff --git a/test/Github/Tests/Api/IssueTest.php b/test/Github/Tests/Api/IssueTest.php index b976f402451..6ad07439edd 100644 --- a/test/Github/Tests/Api/IssueTest.php +++ b/test/Github/Tests/Api/IssueTest.php @@ -16,7 +16,7 @@ public function shouldGetIssues() ]; $sentData = $data + [ 'page' => 1, - ]; + ]; $api = $this->getApiMock(); $api->expects($this->once()) @@ -43,7 +43,7 @@ public function shouldGetIssuesUsingAdditionalParameters() ]; $sentData = $data + [ 'page' => 1, - ]; + ]; $api = $this->getApiMock(); $api->expects($this->once()) diff --git a/test/Github/Tests/Api/PullRequest/CommentsTest.php b/test/Github/Tests/Api/PullRequest/CommentsTest.php index b9a7ec59514..c180607e837 100644 --- a/test/Github/Tests/Api/PullRequest/CommentsTest.php +++ b/test/Github/Tests/Api/PullRequest/CommentsTest.php @@ -14,7 +14,7 @@ class CommentsTest extends TestCase public function shouldGetAllReviewCommentsForAPullRequest() { $expectedValue = [ - [ + [ 'url' => 'https://api.github.com/repos/octocat/Hello-World/pulls/comments/1', 'id' => 1, 'pull_request_review_id' => 42, diff --git a/test/Github/Tests/Functional/CacheTest.php b/test/Github/Tests/Functional/CacheTest.php index 6fd190dbca8..a220d355684 100644 --- a/test/Github/Tests/Functional/CacheTest.php +++ b/test/Github/Tests/Functional/CacheTest.php @@ -61,7 +61,7 @@ private function getCurrentUserResponse($username) ]; $body = \GuzzleHttp\Psr7\stream_for(json_encode([ - 'login' => $username, + 'login' => $username, ])); return new Response(200, $headers, $body);