Passed
Push — master ( 978abe...35535b )
by smiley
01:58
created
src/Core/OAuthProvider.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -277,8 +277,7 @@
 block discarded – undo
277 277
 
278 278
 			if($contentType === 'application/x-www-form-urlencoded'){
279 279
 				$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
280
-			}
281
-			elseif($contentType === 'application/json'){
280
+			} elseif($contentType === 'application/json'){
282 281
 				$body = $this->streamFactory->createStream(json_encode($body));
283 282
 			}
284 283
 
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 *
122 122
 	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
123 123
 	 */
124
-	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options){
124
+	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options) {
125 125
 		$this->http    = $http;
126 126
 		$this->storage = $storage;
127 127
 		$this->options = $options;
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
 
134 134
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
135 135
 
136
-		if(!empty($this->endpointMap) && class_exists($this->endpointMap)){
136
+		if (!empty($this->endpointMap) && class_exists($this->endpointMap)) {
137 137
 			$this->endpoints = new $this->endpointMap;
138 138
 
139
-			if(!$this->endpoints instanceof EndpointMapInterface){
139
+			if (!$this->endpoints instanceof EndpointMapInterface) {
140 140
 				throw new ApiClientException('invalid endpoint map'); // @codeCoverageIgnore
141 141
 			}
142 142
 
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 	 *
150 150
 	 * @return string|null
151 151
 	 */
152
-	public function __get(string $name):?string{
152
+	public function __get(string $name): ?string{
153 153
 
154
-		if(!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)){
154
+		if (!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)) {
155 155
 			return null;
156 156
 		}
157 157
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 */
208 208
 	public function __call(string $name, array $arguments):ResponseInterface{
209 209
 
210
-		if(!$this->endpoints instanceof EndpointMapInterface || !$this->endpoints->__isset($name)){
210
+		if (!$this->endpoints instanceof EndpointMapInterface || !$this->endpoints->__isset($name)) {
211 211
 			throw new ApiClientException('endpoint not found');
212 212
 		}
213 213
 
@@ -220,21 +220,21 @@  discard block
 block discarded – undo
220 220
 		$path_elements = $m['path_elements'] ?? [];
221 221
 		$params_in_url = count($path_elements);
222 222
 		$params        = $arguments[$params_in_url] ?? [];
223
-		$urlparams     = array_slice($arguments,0 , $params_in_url);
223
+		$urlparams     = array_slice($arguments, 0, $params_in_url);
224 224
 
225
-		if($params_in_url > 0){
225
+		if ($params_in_url > 0) {
226 226
 
227
-			if(count($urlparams) < $params_in_url){
227
+			if (count($urlparams) < $params_in_url) {
228 228
 				throw new APIClientException('too few URL params, required: '.implode(', ', $path_elements));
229 229
 			}
230 230
 
231 231
 			$endpoint = sprintf($endpoint, ...$urlparams);
232 232
 		}
233 233
 
234
-		if(in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE'])){
234
+		if (in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE'])) {
235 235
 			$body = $arguments[$params_in_url + 1] ?? $params;
236 236
 
237
-			if($params === $body){
237
+			if ($params === $body) {
238 238
 				$params = [];
239 239
 			}
240 240
 
@@ -281,32 +281,32 @@  discard block
 block discarded – undo
281 281
 		$token = $this->storage->getAccessToken($this->serviceName);
282 282
 
283 283
 		// attempt to refresh an expired token
284
-		if($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
284
+		if ($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)) {
285 285
 			$token = $this->refreshAccessToken($token);
286 286
 		}
287 287
 
288 288
 		$request = $this->requestFactory
289 289
 			->createRequest($method ?? 'GET', Psr7\merge_query($this->apiURL.$path, $params ?? []));
290 290
 
291
-		foreach(array_merge($this->apiHeaders, $headers ?? []) as $header => $value){
291
+		foreach (array_merge($this->apiHeaders, $headers ?? []) as $header => $value) {
292 292
 			$request = $request->withAddedHeader($header, $value);
293 293
 		}
294 294
 
295 295
 		$request = $this->getRequestAuthorization($request, $token);
296 296
 
297
-		if(is_array($body) && $request->hasHeader('content-type')){
297
+		if (is_array($body) && $request->hasHeader('content-type')) {
298 298
 			$contentType = strtolower($request->getHeaderLine('content-type'));
299 299
 
300
-			if($contentType === 'application/x-www-form-urlencoded'){
300
+			if ($contentType === 'application/x-www-form-urlencoded') {
301 301
 				$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
302 302
 			}
303
-			elseif($contentType === 'application/json'){
303
+			elseif ($contentType === 'application/json') {
304 304
 				$body = $this->streamFactory->createStream(json_encode($body));
305 305
 			}
306 306
 
307 307
 		}
308 308
 
309
-		if($body instanceof StreamInterface){
309
+		if ($body instanceof StreamInterface) {
310 310
 			$request = $request->withBody($body);
311 311
 		}
312 312
 
Please login to merge, or discard this patch.
src/OAuthOptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,6 @@
 block discarded – undo
36 36
  * @property string     $ca_info
37 37
  * @property int        $max_redirects
38 38
  */
39
-class OAuthOptions extends SettingsContainerAbstract{
39
+class OAuthOptions extends SettingsContainerAbstract {
40 40
 	use OAuthOptionsTrait, HTTPOptionsTrait;
41 41
 }
Please login to merge, or discard this patch.
src/OAuthOptionsTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 namespace chillerlan\OAuth;
14 14
 
15
-trait OAuthOptionsTrait{
15
+trait OAuthOptionsTrait {
16 16
 
17 17
 	/**
18 18
 	 * @var string
Please login to merge, or discard this patch.
src/Storage/OAuthStorageAbstract.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 use chillerlan\OAuth\{Core\AccessToken, OAuthOptions};
16 16
 use chillerlan\Settings\SettingsContainerInterface;
17 17
 
18
-abstract class OAuthStorageAbstract implements OAuthStorageInterface{
18
+abstract class OAuthStorageAbstract implements OAuthStorageInterface {
19 19
 
20 20
 	/**
21 21
 	 * @var \chillerlan\OAuth\OAuthOptions
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 *
28 28
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
29 29
 	 */
30
-	public function __construct(SettingsContainerInterface $options = null){
30
+	public function __construct(SettingsContainerInterface $options = null) {
31 31
 		$this->options = $options ?? new OAuthOptions;
32 32
 	}
33 33
 
Please login to merge, or discard this patch.
examples/OAuth1Testprovider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
 use chillerlan\OAuth\Core\OAuth1Provider;
16 16
 
17
-class OAuth1Testprovider extends OAuth1Provider{
17
+class OAuth1Testprovider extends OAuth1Provider {
18 18
 
19 19
 	protected $apiURL          = 'https://api.example.com';
20 20
 	protected $requestTokenURL = 'https://example.com/oauth/request_token';
Please login to merge, or discard this patch.
examples/TestEndpoints.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
 use chillerlan\HTTP\MagicAPI\EndpointMap;
16 16
 
17
-class TestEndpoints extends EndpointMap{
17
+class TestEndpoints extends EndpointMap {
18 18
 
19 19
 	protected $test = [
20 20
 		'path'          => '/test/%1$s',
Please login to merge, or discard this patch.
examples/OAuth2Testprovider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	protected $authURL        = 'https://example.com/oauth2/authorize';
25 25
 	protected $accessTokenURL = 'https://example.com/oauth2/token';
26 26
 	protected $userRevokeURL  = 'https://account.example.com/apps/';
27
-	protected $endpointMap     = TestEndpoints::class;
27
+	protected $endpointMap = TestEndpoints::class;
28 28
 	protected $authHeaders    = ['foo' => 'bar'];
29 29
 	protected $apiHeaders     = ['foo' => 'bar'];
30 30
 
Please login to merge, or discard this patch.
src/Core/OAuth1Provider.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 use DateTime;
17 17
 use Psr\Http\Message\{RequestInterface, ResponseInterface, UriInterface};
18 18
 
19
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
19
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
20 20
 
21 21
 	/**
22 22
 	 * @var string
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 			->withHeader('Authorization', 'OAuth '.Psr7\build_http_query($params, true, ', ', '"'));
60 60
 		;
61 61
 
62
-		foreach($this->authHeaders as $header => $value){
62
+		foreach ($this->authHeaders as $header => $value) {
63 63
 			$request = $request->withAddedHeader($header, $value);
64 64
 		}
65 65
 
@@ -76,17 +76,17 @@  discard block
 block discarded – undo
76 76
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
77 77
 		parse_str($response->getBody()->getContents(), $data);
78 78
 
79
-		if(!$data || !is_array($data)){
79
+		if (!$data || !is_array($data)) {
80 80
 			throw new ProviderException('unable to parse token response');
81 81
 		}
82
-		elseif(isset($data['error'])){
82
+		elseif (isset($data['error'])) {
83 83
 			throw new ProviderException('error retrieving access token: '.$data['error']);
84 84
 		}
85
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
85
+		elseif (!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])) {
86 86
 			throw new ProviderException('invalid token');
87 87
 		}
88 88
 
89
-		if($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')){
89
+		if ($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')) {
90 90
 			throw new ProviderException('oauth callback unconfirmed');
91 91
 		}
92 92
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	protected function getSignature(string $url, array $params, string $method, string $accessTokenSecret = null):string{
132 132
 		$parseURL = parse_url($url);
133 133
 
134
-		if(!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)){
134
+		if (!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)) {
135 135
 			throw new ProviderException('getSignature: invalid url');
136 136
 		}
137 137
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 		$signatureParams = array_merge($query, $params);
141 141
 
142
-		if(isset($signatureParams['oauth_signature'])){
142
+		if (isset($signatureParams['oauth_signature'])) {
143 143
 			unset($signatureParams['oauth_signature']);
144 144
 		}
145 145
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -78,11 +78,9 @@
 block discarded – undo
78 78
 
79 79
 		if(!$data || !is_array($data)){
80 80
 			throw new ProviderException('unable to parse token response');
81
-		}
82
-		elseif(isset($data['error'])){
81
+		} elseif(isset($data['error'])){
83 82
 			throw new ProviderException('error retrieving access token: '.$data['error']);
84
-		}
85
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
83
+		} elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
86 84
 			throw new ProviderException('invalid token');
87 85
 		}
88 86
 
Please login to merge, or discard this patch.