Completed
Branch master (c6d423)
by smiley
02:44 queued 47s
created
src/Providers/TokenExpires.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,6 +12,6 @@
 block discarded – undo
12 12
 
13 13
 namespace chillerlan\OAuth\Providers;
14 14
 
15
-interface TokenExpires{
15
+interface TokenExpires {
16 16
 
17 17
 }
Please login to merge, or discard this patch.
src/Providers/OAuth1Interface.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\Token;
16 16
 
17
-interface OAuth1Interface extends OAuthInterface{
17
+interface OAuth1Interface extends OAuthInterface {
18 18
 
19 19
 	/**
20 20
 	 * @return \chillerlan\OAuth\Token
Please login to merge, or discard this patch.
src/Providers/OAuth2Interface.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\Token;
16 16
 
17
-interface OAuth2Interface extends OAuthInterface{
17
+interface OAuth2Interface extends OAuthInterface {
18 18
 
19 19
 	const HEADER_OAUTH              = 0;
20 20
 	const HEADER_BEARER             = 1;
Please login to merge, or discard this patch.
src/Providers/OAuth1Provider.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 use chillerlan\HTTP\HTTPResponseInterface;
17 17
 use DateTime;
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
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 * @return \chillerlan\OAuth\Token
48 48
 	 */
49 49
 	public function getRequestToken():Token {
50
-		$params   = $this->getRequestTokenHeaderParams();
50
+		$params = $this->getRequestTokenHeaderParams();
51 51
 
52 52
 		return $this->parseTokenResponse(
53 53
 			$this->httpPOST(
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 	protected function parseTokenResponse(HTTPResponseInterface $response, bool $checkCallbackConfirmed = null):Token {
73 73
 		parse_str($response->body, $data);
74 74
 
75
-		if(!$data || !is_array($data)){
75
+		if (!$data || !is_array($data)) {
76 76
 			throw new ProviderException('unable to parse token response');
77 77
 		}
78
-		elseif(isset($data['error'])){
78
+		elseif (isset($data['error'])) {
79 79
 			throw new ProviderException('error retrieving access token: '.$data['error']);
80 80
 		}
81
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
81
+		elseif (!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])) {
82 82
 			throw new ProviderException('token missing');
83 83
 		}
84 84
 
85
-		if(($checkCallbackConfirmed ?? false)
85
+		if (($checkCallbackConfirmed ?? false)
86 86
 		   && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')
87
-		){
87
+		) {
88 88
 			throw new ProviderException('oauth callback unconfirmed');
89 89
 		}
90 90
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	public function getSignature(string $url, array $params, string $method = null):string {
148 148
 		$parseURL = parse_url($url);
149 149
 
150
-		if(!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)){
150
+		if (!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)) {
151 151
 			throw new ProviderException('getSignature: invalid url');
152 152
 		}
153 153
 
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 	 *
172 172
 	 * @return string
173 173
 	 */
174
-	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method){
174
+	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method) {
175 175
 
176
-		if(isset($signatureParams['oauth_signature'])){
176
+		if (isset($signatureParams['oauth_signature'])) {
177 177
 			unset($signatureParams['oauth_signature']);
178 178
 		}
179 179
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	public function getAccessToken(string $token, string $verifier, string $tokenSecret = null):Token {
197 197
 		$this->tokenSecret = $tokenSecret;
198 198
 
199
-		if(empty($this->tokenSecret)){
199
+		if (empty($this->tokenSecret)) {
200 200
 			$this->tokenSecret = $this->storage->retrieveAccessToken($this->serviceName)->requestTokenSecret;
201 201
 		}
202 202
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 
233 233
 		$parameters['oauth_signature'] = $this->getSignature($url, array_merge($params ?? [], $parameters), $method);
234 234
 
235
-		if(isset($params['oauth_session_handle'])){
235
+		if (isset($params['oauth_session_handle'])) {
236 236
 			$parameters['oauth_session_handle'] = $params['oauth_session_handle'];
237 237
 			unset($params['oauth_session_handle']);
238 238
 		}
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,11 +74,9 @@
 block discarded – undo
74 74
 
75 75
 		if(!$data || !is_array($data)){
76 76
 			throw new ProviderException('unable to parse token response');
77
-		}
78
-		elseif(isset($data['error'])){
77
+		} elseif(isset($data['error'])){
79 78
 			throw new ProviderException('error retrieving access token: '.$data['error']);
80
-		}
81
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
79
+		} elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
82 80
 			throw new ProviderException('token missing');
83 81
 		}
84 82
 
Please login to merge, or discard this patch.
bin/dbstorage_create.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,22 +69,22 @@
 block discarded – undo
69 69
 	->table(TABLE_TOKEN)
70 70
 	->primaryKey('label')
71 71
 	->varchar('label', 32, null, false)
72
-	->int('user_id',10, null, false)
72
+	->int('user_id', 10, null, false)
73 73
 	->varchar('provider_id', 30, '', false)
74 74
 	->text('token', null, true)
75 75
 	->text('state')
76
-	->int('expires',10, null, false)
76
+	->int('expires', 10, null, false)
77 77
 	->query();
78 78
 
79 79
 $db->raw('DROP TABLE IF EXISTS '.TABLE_PROVIDER);
80 80
 $db->create
81 81
 	->table(TABLE_PROVIDER)
82 82
 	->primaryKey('provider_id')
83
-	->tinyint('provider_id',10, null, false, 'UNSIGNED AUTO_INCREMENT')
83
+	->tinyint('provider_id', 10, null, false, 'UNSIGNED AUTO_INCREMENT')
84 84
 	->varchar('servicename', 30, '', false)
85 85
 	->query();
86 86
 
87
-foreach($providers as $i => $provider){
87
+foreach ($providers as $i => $provider) {
88 88
 	$db->insert
89 89
 		->into(TABLE_PROVIDER)
90 90
 		->values(['provider_id' => $i, 'servicename' => $provider])
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
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 /**
18 18
  *
19 19
  */
20
-class OAuth1Testprovider extends OAuth1Provider{
20
+class OAuth1Testprovider extends OAuth1Provider {
21 21
 
22 22
 	protected $apiURL          = 'https://api.example.com';
23 23
 	protected $requestTokenURL = 'https://example.com/oauth/request_token';
Please login to merge, or discard this patch.
src/Providers/OAuthProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
90 90
 	 * @param \chillerlan\Traits\ContainerInterface           $options
91 91
 	 */
92
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
92
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options) {
93 93
 		$this->setHTTPClient($http);
94 94
 
95 95
 		$this->storage = $storage;
Please login to merge, or discard this patch.