Skip to content

Commit 8ce66f5

Browse files
lucasmichotlucasmichot
authoredNov 7, 2024··
Fix style with pint (#232)
·
v4.8.1v4.7.0
1 parent ab8588a commit 8ce66f5

16 files changed

+93
-81
lines changed
 

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
/.github/CONTRIBUTING.md export-ignore
1212
/CHANGELOG.md export-ignore
1313
/README.md export-ignore
14+
/pint.json export-ignore

‎pint.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"preset": "laravel",
3+
"rules": {
4+
"binary_operator_spaces": {
5+
"operators": {
6+
"=>": "align"
7+
}
8+
},
9+
"is_null": true,
10+
"no_superfluous_elseif": true,
11+
"no_superfluous_phpdoc_tags": false,
12+
"no_useless_else": true,
13+
"yoda_style": {
14+
"always_move_variable": true,
15+
"equal": false,
16+
"identical": false,
17+
"less_and_greater": false
18+
}
19+
}
20+
}

‎src/Exception/InvalidArgumentException.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
use InvalidArgumentException as BaseInvalidArgumentException;
66

7-
class InvalidArgumentException extends BaseInvalidArgumentException
8-
{
9-
}
7+
class InvalidArgumentException extends BaseInvalidArgumentException {}

‎src/Exception/MissingConfigException.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
use Exception;
66

7-
class MissingConfigException extends Exception
8-
{
9-
}
7+
class MissingConfigException extends Exception {}

‎src/Helpers/ConfigRetriever.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function fromServices($providerName, array $additionalConfigKeys = [])
4747
$this->getFromServices('client_id'),
4848
$this->getFromServices('client_secret'),
4949
$this->getFromServices('redirect'),
50-
$this->getConfigItems($additionalConfigKeys, fn($key) => $this->getFromServices(strtolower($key)))
50+
$this->getConfigItems($additionalConfigKeys, fn ($key) => $this->getFromServices(strtolower($key)))
5151
);
5252
}
5353

@@ -114,9 +114,9 @@ protected function getConfigFromServicesArray($providerName)
114114
// If we are running in console we should spoof values to make Socialite happy...
115115
if (app()->runningInConsole()) {
116116
$configArray = [
117-
'client_id' => "{$this->providerIdentifier}_KEY",
117+
'client_id' => "{$this->providerIdentifier}_KEY",
118118
'client_secret' => "{$this->providerIdentifier}_SECRET",
119-
'redirect' => "{$this->providerIdentifier}_REDIRECT_URI",
119+
'redirect' => "{$this->providerIdentifier}_REDIRECT_URI",
120120
];
121121
} else {
122122
throw new MissingConfigException("There is no services entry for $providerName");

‎src/OAuth1/AbstractProvider.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function user()
7272
*/
7373
public function userFromTokenAndSecret($token, $secret)
7474
{
75-
$tokenCredentials = new TokenCredentials();
75+
$tokenCredentials = new TokenCredentials;
7676

7777
$tokenCredentials->setIdentifier($token);
7878
$tokenCredentials->setSecret($secret);
@@ -172,8 +172,8 @@ protected function getToken()
172172
]);
173173

174174
return $this->server->getTokenCredentials(
175-
$temp, $this->request->get('oauth_token'), $this->request->get('oauth_verifier')
176-
);
175+
$temp, $this->request->get('oauth_token'), $this->request->get('oauth_verifier')
176+
);
177177
}
178178

179179
/**

‎src/OAuth2/AbstractProvider.php

+8-13
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ abstract class AbstractProvider extends BaseProvider implements ProviderInterfac
2626
protected $user;
2727

2828
/**
29-
* @param string $providerName
30-
*
29+
* @param string $providerName
3130
* @return string
3231
*/
3332
public static function serviceContainerKey($providerName)
3433
{
35-
return SocialiteWasCalled::SERVICE_CONTAINER_PREFIX . $providerName;
34+
return SocialiteWasCalled::SERVICE_CONTAINER_PREFIX.$providerName;
3635
}
3736

3837
/**
@@ -47,7 +46,7 @@ public function user()
4746
}
4847

4948
if ($this->hasInvalidState()) {
50-
throw new InvalidStateException();
49+
throw new InvalidStateException;
5150
}
5251

5352
$response = $this->getAccessTokenResponse($this->getCode());
@@ -70,8 +69,7 @@ public function user()
7069
/**
7170
* Get the access token from the token response body.
7271
*
73-
* @param array $body
74-
*
72+
* @param array $body
7573
* @return string
7674
*/
7775
protected function parseAccessToken($body)
@@ -82,8 +80,7 @@ protected function parseAccessToken($body)
8280
/**
8381
* Get the refresh token from the token response body.
8482
*
85-
* @param array $body
86-
*
83+
* @param array $body
8784
* @return string
8885
*/
8986
protected function parseRefreshToken($body)
@@ -94,8 +91,7 @@ protected function parseRefreshToken($body)
9491
/**
9592
* Get the expires in from the token response body.
9693
*
97-
* @param array $body
98-
*
94+
* @param array $body
9995
* @return string
10096
*/
10197
protected function parseExpiresIn($body)
@@ -106,15 +102,14 @@ protected function parseExpiresIn($body)
106102
/**
107103
* Get the approved scopes from the token response body.
108104
*
109-
* @param array $body
110-
*
105+
* @param array $body
111106
* @return array
112107
*/
113108
protected function parseApprovedScopes($body)
114109
{
115110
$scopesRaw = Arr::get($body, 'scope', null);
116111

117-
if (!is_array($scopesRaw) && !is_string($scopesRaw)) {
112+
if (! is_array($scopesRaw) && ! is_string($scopesRaw)) {
118113
return [];
119114
}
120115

‎src/ServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function register()
4040
}
4141

4242
if (! $this->app->bound(ConfigRetrieverInterface::class)) {
43-
$this->app->singleton(ConfigRetrieverInterface::class, fn() => new ConfigRetriever());
43+
$this->app->singleton(ConfigRetrieverInterface::class, fn () => new ConfigRetriever);
4444
}
4545
}
4646
}

‎tests/ConfigRetrieverTest.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function it_throws_if_there_is_a_problem_with_the_services_config(): void
2323
->with("services.{$providerName}")
2424
->once()
2525
->andReturn(null);
26-
$configRetriever = new ConfigRetriever();
26+
$configRetriever = new ConfigRetriever;
2727

2828
$configRetriever->fromServices($providerName)->get();
2929
}
@@ -41,7 +41,7 @@ public function it_throws_if_there_are_missing_items_in_the_services_config(): v
4141
->with("services.{$providerName}")
4242
->once()
4343
->andReturn([]);
44-
$configRetriever = new ConfigRetriever();
44+
$configRetriever = new ConfigRetriever;
4545

4646
$configRetriever->fromServices($providerName)->get();
4747
}
@@ -57,17 +57,17 @@ public function it_retrieves_a_config_from_the_services(): void
5757
$uri = 'uri';
5858
$additionalConfigItem = 'test';
5959
$config = [
60-
'client_id' => $key,
60+
'client_id' => $key,
6161
'client_secret' => $secret,
62-
'redirect' => $uri,
63-
'additional' => $additionalConfigItem,
62+
'redirect' => $uri,
63+
'additional' => $additionalConfigItem,
6464
];
6565
self::$functions
6666
->shouldReceive('config')
6767
->with("services.{$providerName}")
6868
->once()
6969
->andReturn($config);
70-
$configRetriever = new ConfigRetriever();
70+
$configRetriever = new ConfigRetriever;
7171

7272
$result = $configRetriever->fromServices($providerName, ['additional'])->get();
7373

@@ -88,18 +88,18 @@ public function it_retrieves_a_config_from_the_services_with_guzzle(): void
8888
$uri = 'uri';
8989
$additionalConfigItem = 'test';
9090
$config = [
91-
'client_id' => $key,
91+
'client_id' => $key,
9292
'client_secret' => $secret,
93-
'redirect' => $uri,
94-
'additional' => $additionalConfigItem,
95-
'guzzle' => ['verify' => false],
93+
'redirect' => $uri,
94+
'additional' => $additionalConfigItem,
95+
'guzzle' => ['verify' => false],
9696
];
9797
self::$functions
9898
->shouldReceive('config')
9999
->with("services.{$providerName}")
100100
->once()
101101
->andReturn($config);
102-
$configRetriever = new ConfigRetriever();
102+
$configRetriever = new ConfigRetriever;
103103

104104
$result = $configRetriever->fromServices($providerName, ['additional'])->get();
105105

@@ -127,7 +127,7 @@ function config($key)
127127

128128
function app()
129129
{
130-
return new applicationStub();
130+
return new applicationStub;
131131
}
132132

133133
class applicationStub

‎tests/ConfigTest.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public function it_returns_a_config_array(): void
1515
$secret = 'secret';
1616
$callbackUri = 'uri';
1717
$result = [
18-
'client_id' => $key,
18+
'client_id' => $key,
1919
'client_secret' => $secret,
20-
'redirect' => $callbackUri,
20+
'redirect' => $callbackUri,
2121
];
2222

2323
$config = new Config($key, $secret, $callbackUri);
@@ -34,10 +34,10 @@ public function it_allows_additional_config_items(): void
3434
$secret = 'secret';
3535
$callbackUri = 'uri';
3636
$result = [
37-
'client_id' => $key,
37+
'client_id' => $key,
3838
'client_secret' => $secret,
39-
'redirect' => $callbackUri,
40-
'additional' => true,
39+
'redirect' => $callbackUri,
40+
'additional' => true,
4141
];
4242
$additional = ['additional' => true];
4343

@@ -54,12 +54,12 @@ public function it_allows_closure_config_redirect()
5454
$key = 'key';
5555
$secret = 'secret';
5656
$callbackUri = 'uri';
57-
$callbackFunc = fn() => $callbackUri;
57+
$callbackFunc = fn () => $callbackUri;
5858
$result = [
59-
'client_id' => $key,
59+
'client_id' => $key,
6060
'client_secret' => $secret,
61-
'redirect' => $callbackUri,
62-
'additional' => true,
61+
'redirect' => $callbackUri,
62+
'additional' => true,
6363
];
6464
$additional = ['additional' => true];
6565

‎tests/ManagerTestTrait.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ protected function configRetrieverMockWithDefaultExpectations($providerName, $pr
9494
protected function config(): array
9595
{
9696
return [
97-
'client_id' => 'test',
97+
'client_id' => 'test',
9898
'client_secret' => 'test',
99-
'redirect' => 'test',
99+
'redirect' => 'test',
100100
];
101101
}
102102

@@ -107,8 +107,8 @@ protected function config(): array
107107
protected function oauth1FormattedConfig(array $config): array
108108
{
109109
return [
110-
'identifier' => $config['client_id'],
111-
'secret' => $config['client_secret'],
110+
'identifier' => $config['client_id'],
111+
'secret' => $config['client_secret'],
112112
'callback_uri' => $config['redirect'],
113113
];
114114
}
@@ -117,7 +117,7 @@ protected function oauth2ProviderStub(): MockInterface
117117
{
118118
static $provider = null;
119119

120-
if (is_null($provider)) {
120+
if ($provider === null) {
121121
$provider = $this->mockStub('OAuth2ProviderStub')->shouldDeferMissing();
122122
}
123123

@@ -128,7 +128,7 @@ protected function oauth1ProviderStub(): MockInterface
128128
{
129129
static $provider = null;
130130

131-
if (is_null($provider)) {
131+
if ($provider === null) {
132132
$provider = $this->mockStub('OAuth1ProviderStub');
133133
}
134134

‎tests/OAuth2ProviderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class OAuth2ProviderTest extends TestCase
2121
*/
2222
public function it_throws_if_there_is_no_config_in_services_or_env(): void
2323
{
24-
$this->expectExceptionObject(new MissingConfigException());
24+
$this->expectExceptionObject(new MissingConfigException);
2525

2626
$providerName = 'bar';
2727
$providerClass = $this->oauth2ProviderStubClass();

‎tests/OAuthTwoTest.php

+24-25
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use SocialiteProviders\Manager\Test\Stubs\OAuthTwoTestProviderStub;
1313
use stdClass;
1414
use Symfony\Component\HttpFoundation\RedirectResponse;
15-
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1615

1716
class OAuthTwoTest extends TestCase
1817
{
@@ -54,7 +53,7 @@ public function userReturnsAUserInstanceForTheAuthenticatedRequest(): void
5453
$session = m::mock(SessionContract::class);
5554
$request = Request::create('foo', 'GET', [
5655
'state' => str_repeat('A', 40),
57-
'code' => 'code',
56+
'code' => 'code',
5857
]);
5958
$request->setLaravelSession($session);
6059
$session
@@ -72,11 +71,11 @@ public function userReturnsAUserInstanceForTheAuthenticatedRequest(): void
7271
'Accept' => 'application/json',
7372
],
7473
'form_params' => [
75-
'grant_type' => 'authorization_code',
76-
'client_id' => 'client_id',
74+
'grant_type' => 'authorization_code',
75+
'client_id' => 'client_id',
7776
'client_secret' => 'client_secret',
78-
'code' => 'code',
79-
'redirect_uri' => 'redirect_uri',
77+
'code' => 'code',
78+
'redirect_uri' => 'redirect_uri',
8079
],
8180
])
8281
->andReturn($response = m::mock(stdClass::class));
@@ -98,7 +97,7 @@ public function access_token_response_body_is_accessible_from_user(): void
9897
$accessTokenResponseBody = '{"access_token": "access_token", "test": "test"}';
9998
$request = Request::create('foo', 'GET', [
10099
'state' => str_repeat('A', 40),
101-
'code' => 'code',
100+
'code' => 'code',
102101
]);
103102
$request->setLaravelSession($session);
104103
$session
@@ -116,11 +115,11 @@ public function access_token_response_body_is_accessible_from_user(): void
116115
'Accept' => 'application/json',
117116
],
118117
'form_params' => [
119-
'grant_type' => 'authorization_code',
120-
'client_id' => 'client_id',
118+
'grant_type' => 'authorization_code',
119+
'client_id' => 'client_id',
121120
'client_secret' => 'client_secret',
122-
'code' => 'code',
123-
'redirect_uri' => 'redirect_uri',
121+
'code' => 'code',
122+
'redirect_uri' => 'redirect_uri',
124123
],
125124
])
126125
->andReturn($response = m::mock(stdClass::class));
@@ -143,7 +142,7 @@ public function regular_laravel_socialite_class_works_as_well(): void
143142
$accessTokenResponseBody = '{"access_token": "access_token", "test": "test"}';
144143
$request = Request::create('foo', 'GET', [
145144
'state' => str_repeat('A', 40),
146-
'code' => 'code',
145+
'code' => 'code',
147146
]);
148147
$request->setLaravelSession($session);
149148
$session
@@ -162,11 +161,11 @@ public function regular_laravel_socialite_class_works_as_well(): void
162161
'Accept' => 'application/json',
163162
],
164163
'form_params' => [
165-
'grant_type' => 'authorization_code',
166-
'client_id' => 'client_id',
164+
'grant_type' => 'authorization_code',
165+
'client_id' => 'client_id',
167166
'client_secret' => 'client_secret',
168-
'code' => 'code',
169-
'redirect_uri' => 'redirect_uri',
167+
'code' => 'code',
168+
'redirect_uri' => 'redirect_uri',
170169
],
171170
])
172171
->andReturn($response = m::mock(stdClass::class));
@@ -184,12 +183,12 @@ public function regular_laravel_socialite_class_works_as_well(): void
184183
*/
185184
public function exceptionIsThrownIfStateIsInvalid(): void
186185
{
187-
$this->expectExceptionObject(new InvalidStateException());
186+
$this->expectExceptionObject(new InvalidStateException);
188187

189188
$session = m::mock(SessionContract::class);
190189
$request = Request::create('foo', 'GET', [
191190
'state' => str_repeat('B', 40),
192-
'code' => 'code',
191+
'code' => 'code',
193192
]);
194193
$request->setLaravelSession($session);
195194
$session
@@ -206,12 +205,12 @@ public function exceptionIsThrownIfStateIsInvalid(): void
206205
*/
207206
public function exceptionIsThrownIfStateIsNotSet(): void
208207
{
209-
$this->expectExceptionObject(new InvalidStateException());
208+
$this->expectExceptionObject(new InvalidStateException);
210209

211210
$session = m::mock(SessionContract::class);
212211
$request = Request::create('foo', 'GET', [
213212
'state' => 'state',
214-
'code' => 'code',
213+
'code' => 'code',
215214
]);
216215
$request->setLaravelSession($session);
217216
$session
@@ -231,7 +230,7 @@ public function userObjectShouldBeCachedOnFirstCall(): void
231230
$accessTokenResponseBody = '{"access_token": "access_token", "test": "test"}';
232231
$request = Request::create('foo', 'GET', [
233232
'state' => str_repeat('A', 40),
234-
'code' => 'code',
233+
'code' => 'code',
235234
]);
236235
$request->setLaravelSession($session);
237236
$session
@@ -250,11 +249,11 @@ public function userObjectShouldBeCachedOnFirstCall(): void
250249
'Accept' => 'application/json',
251250
],
252251
'form_params' => [
253-
'grant_type' => 'authorization_code',
254-
'client_id' => 'client_id',
252+
'grant_type' => 'authorization_code',
253+
'client_id' => 'client_id',
255254
'client_secret' => 'client_secret',
256-
'code' => 'code',
257-
'redirect_uri' => 'redirect_uri',
255+
'code' => 'code',
256+
'redirect_uri' => 'redirect_uri',
258257
],
259258
])
260259
->andReturn($response = m::mock(stdClass::class));

‎tests/Stubs/OAuth2ProviderStub.php

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
class OAuth2ProviderStub extends AbstractProvider
88
{
99
protected $test = 'test';
10+
1011
public const IDENTIFIER = 'TEST';
1112

1213
/**

‎tests/Stubs/OAuthTwoTestProviderStub.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function getUserByToken($token)
3535

3636
protected function mapUserToObject(array $user)
3737
{
38-
return (new User())->map(['id' => $user['id']]);
38+
return (new User)->map(['id' => $user['id']]);
3939
}
4040

4141
protected function getHttpClient()

‎tests/UserTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class UserTest extends TestCase
1515
public function we_should_be_able_to_set_the_credentials_body(): void
1616
{
1717
$credentialsBody = ['test'];
18-
$user = (new User())->setAccessTokenResponseBody($credentialsBody);
18+
$user = (new User)->setAccessTokenResponseBody($credentialsBody);
1919

2020
$this->assertSame($user->accessTokenResponseBody, $credentialsBody);
2121
}

0 commit comments

Comments
 (0)
Please sign in to comment.