From 1443fa79fddba2f66c0c5efa875afa061a79d31a Mon Sep 17 00:00:00 2001 From: lucasmichot Date: Thu, 31 Aug 2023 09:20:27 +0000 Subject: [PATCH] Fix code styling --- src/Config.php | 4 ++-- src/Helpers/ConfigRetriever.php | 2 +- src/OAuth1/AbstractProvider.php | 4 ++-- src/OAuth1/Server.php | 4 ++-- src/OAuth2/AbstractProvider.php | 4 ++-- src/ServiceProvider.php | 2 +- tests/ConfigTest.php | 2 +- tests/ManagerTestTrait.php | 4 ++-- tests/Stubs/OAuth2ProviderStub.php | 1 + 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Config.php b/src/Config.php index a2822c4..a53289b 100644 --- a/src/Config.php +++ b/src/Config.php @@ -23,9 +23,9 @@ class Config implements Contracts\ConfigInterface public function __construct($key, $secret, $callbackUri, array $additionalProviderConfig = []) { $this->config = array_merge([ - 'client_id' => $key, + 'client_id' => $key, 'client_secret' => $secret, - 'redirect' => $this->formatRedirectUri($callbackUri), + 'redirect' => $this->formatRedirectUri($callbackUri), ], $additionalProviderConfig); } diff --git a/src/Helpers/ConfigRetriever.php b/src/Helpers/ConfigRetriever.php index e978767..ae23b31 100644 --- a/src/Helpers/ConfigRetriever.php +++ b/src/Helpers/ConfigRetriever.php @@ -45,7 +45,7 @@ public function fromServices($providerName, array $additionalConfigKeys = []) $this->getFromServices('client_id'), $this->getFromServices('client_secret'), $this->getFromServices('redirect'), - $this->getConfigItems($additionalConfigKeys, fn($key) => $this->getFromServices(strtolower($key))) + $this->getConfigItems($additionalConfigKeys, fn ($key) => $this->getFromServices(strtolower($key))) ); } diff --git a/src/OAuth1/AbstractProvider.php b/src/OAuth1/AbstractProvider.php index 2c44f3f..df47b97 100644 --- a/src/OAuth1/AbstractProvider.php +++ b/src/OAuth1/AbstractProvider.php @@ -172,8 +172,8 @@ protected function getToken() ]); return $this->server->getTokenCredentials( - $temp, $this->request->get('oauth_token'), $this->request->get('oauth_verifier') - ); + $temp, $this->request->get('oauth_token'), $this->request->get('oauth_verifier') + ); } /** diff --git a/src/OAuth1/Server.php b/src/OAuth1/Server.php index bfe036b..10bbd8a 100644 --- a/src/OAuth1/Server.php +++ b/src/OAuth1/Server.php @@ -65,7 +65,7 @@ public function getTokenCredentials(TemporaryCredentials $temporaryCredentials, try { if ($client instanceof Client) { $response = $client->post($uri, [ - 'headers' => $headers, + 'headers' => $headers, 'form_params' => $bodyParameters, ]); } else { @@ -76,7 +76,7 @@ public function getTokenCredentials(TemporaryCredentials $temporaryCredentials, } return [ - 'tokenCredentials' => $this->createTokenCredentials($response->getBody()), + 'tokenCredentials' => $this->createTokenCredentials($response->getBody()), 'credentialsResponseBody' => $response->getBody(), ]; } diff --git a/src/OAuth2/AbstractProvider.php b/src/OAuth2/AbstractProvider.php index c32f5f7..503b8fb 100644 --- a/src/OAuth2/AbstractProvider.php +++ b/src/OAuth2/AbstractProvider.php @@ -61,8 +61,8 @@ public function user() } return $this->user->setToken($token) - ->setRefreshToken($this->parseRefreshToken($response)) - ->setExpiresIn($this->parseExpiresIn($response)); + ->setRefreshToken($this->parseRefreshToken($response)) + ->setExpiresIn($this->parseExpiresIn($response)); } /** diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 1d1b1dc..ed8fab3 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -40,7 +40,7 @@ public function register() } if (! $this->app->bound(ConfigRetrieverInterface::class)) { - $this->app->singleton(ConfigRetrieverInterface::class, fn() => new ConfigRetriever()); + $this->app->singleton(ConfigRetrieverInterface::class, fn () => new ConfigRetriever()); } } } diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 70e36ef..ab8ffb2 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -54,7 +54,7 @@ public function it_allows_closure_config_redirect() $key = 'key'; $secret = 'secret'; $callbackUri = 'uri'; - $callbackFunc = fn() => $callbackUri; + $callbackFunc = fn () => $callbackUri; $result = [ 'client_id' => $key, 'client_secret' => $secret, diff --git a/tests/ManagerTestTrait.php b/tests/ManagerTestTrait.php index 186a31f..d388c48 100644 --- a/tests/ManagerTestTrait.php +++ b/tests/ManagerTestTrait.php @@ -117,7 +117,7 @@ protected function oauth2ProviderStub(): MockInterface { static $provider = null; - if (is_null($provider)) { + if ($provider === null) { $provider = $this->mockStub('OAuth2ProviderStub')->shouldDeferMissing(); } @@ -128,7 +128,7 @@ protected function oauth1ProviderStub(): MockInterface { static $provider = null; - if (is_null($provider)) { + if ($provider === null) { $provider = $this->mockStub('OAuth1ProviderStub'); } diff --git a/tests/Stubs/OAuth2ProviderStub.php b/tests/Stubs/OAuth2ProviderStub.php index 1aef964..f5a0df1 100644 --- a/tests/Stubs/OAuth2ProviderStub.php +++ b/tests/Stubs/OAuth2ProviderStub.php @@ -7,6 +7,7 @@ class OAuth2ProviderStub extends AbstractProvider { protected $test = 'test'; + public const IDENTIFIER = 'TEST'; /**