chillerlan / php-oauth-core

src/Providers/OAuth1Interface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Token;
 
-interface OAuth1Interface extends OAuthInterface{
+interface OAuth1Interface extends OAuthInterface {
 
 	/**
 	 * @return \chillerlan\OAuth\Token

src/Providers/OAuth2Interface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Token;
 
-interface OAuth2Interface extends OAuthInterface{
+interface OAuth2Interface extends OAuthInterface {
 
 	const HEADER_OAUTH              = 0;
 	const HEADER_BEARER             = 1;

src/Providers/OAuth1Provider.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\HTTP\HTTPResponseInterface;
 use DateTime;
 
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * @var string
@@ -47,7 +47,7 @@ 
 	 * @return \chillerlan\OAuth\Token
 	 */
 	public function getRequestToken():Token {
-		$params   = $this->getRequestTokenHeaderParams();
+		$params = $this->getRequestTokenHeaderParams();
 
 		return $this->parseTokenResponse(
 			$this->httpPOST(
@@ -72,19 +72,19 @@ 
 	protected function parseTokenResponse(HTTPResponseInterface $response, bool $checkCallbackConfirmed = null):Token {
 		parse_str($response->body, $data);
 
-		if(!$data || !is_array($data)){
+		if (!$data || !is_array($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
-		elseif(isset($data['error'])){
+		elseif (isset($data['error'])) {
 			throw new ProviderException('error retrieving access token: '.$data['error']);
 		}
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
+		elseif (!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])) {
 			throw new ProviderException('token missing');
 		}
 
-		if(($checkCallbackConfirmed ?? false)
+		if (($checkCallbackConfirmed ?? false)
 		   && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')
-		){
+		) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -147,7 +147,7 @@ 
 	public function getSignature(string $url, array $params, string $method = null):string {
 		$parseURL = parse_url($url);
 
-		if(!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)){
+		if (!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)) {
 			throw new ProviderException('getSignature: invalid url');
 		}
 
@@ -171,9 +171,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method){
+	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method) {
 
-		if(isset($signatureParams['oauth_signature'])){
+		if (isset($signatureParams['oauth_signature'])) {
 			unset($signatureParams['oauth_signature']);
 		}
 
@@ -196,7 +196,7 @@ 
 	public function getAccessToken(string $token, string $verifier, string $tokenSecret = null):Token {
 		$this->tokenSecret = $tokenSecret;
 
-		if(empty($this->tokenSecret)){
+		if (empty($this->tokenSecret)) {
 			$this->tokenSecret = $this->storage->retrieveAccessToken($this->serviceName)->requestTokenSecret;
 		}
 
@@ -232,7 +232,7 @@ 
 
 		$parameters['oauth_signature'] = $this->getSignature($url, array_merge($params ?? [], $parameters), $method);
 
-		if(isset($params['oauth_session_handle'])){
+		if (isset($params['oauth_session_handle'])) {
 			$parameters['oauth_session_handle'] = $params['oauth_session_handle'];
 			unset($params['oauth_session_handle']);
 		}

Braces +2 added lines, -4 removed lines

@@ -74,11 +74,9 @@
 
 		if(!$data || !is_array($data)){
 			throw new ProviderException('unable to parse token response');
-		}
-		elseif(isset($data['error'])){
+		} elseif(isset($data['error'])){
 			throw new ProviderException('error retrieving access token: '.$data['error']);
-		}
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
+		} elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
 			throw new ProviderException('token missing');
 		}
 

examples/OAuth1Testprovider.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 /**
  *
  */
-class OAuth1Testprovider extends OAuth1Provider{
+class OAuth1Testprovider extends OAuth1Provider {
 
 	protected $apiURL          = 'https://api.example.com';
 	protected $requestTokenURL = 'https://example.com/oauth/request_token';

src/Providers/OAuthProvider.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
 	 * @param \chillerlan\Traits\ContainerInterface           $options
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options) {
 		$this->setHTTPClient($http);
 
 		$this->storage = $storage;
@@ -96,7 +96,7 @@ 
 
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
-		if($this instanceof ApiClientInterface){
+		if ($this instanceof ApiClientInterface) {
 			$this->loadEndpoints();
 		}
 

src/Storage/DBTokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\OAuth\Token;
 use chillerlan\Traits\ContainerInterface;
 
-class DBTokenStorage extends TokenStorageAbstract{
+class DBTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var \chillerlan\Database\Database
@@ -31,10 +31,10 @@ 
 	 *
 	 * @throws \chillerlan\OAuth\Storage\TokenStorageException
 	 */
-	public function __construct(ContainerInterface $options, Database $db){
+	public function __construct(ContainerInterface $options, Database $db) {
 		parent::__construct($options);
 
-		if(!$this->options->dbTokenTable || !$this->options->dbProviderTable){
+		if (!$this->options->dbTokenTable || !$this->options->dbProviderTable) {
 			throw new TokenStorageException('invalid table config');
 		}
 
@@ -62,7 +62,7 @@ 
 	public function storeAccessToken(string $service, Token $token):TokenStorageInterface{
 		$providers = $this->getProviders();
 
-		if(empty($providers) || !isset($providers[$service])){
+		if (empty($providers) || !isset($providers[$service])) {
 			throw new TokenStorageException('unknown service');
 		}
 
@@ -73,7 +73,7 @@ 
 			$this->options->dbTokenTableExpires    => $token->expires,
 		];
 
-		if($this->hasAccessToken($service) === true){
+		if ($this->hasAccessToken($service) === true) {
 			$this->db->update
 				->table($this->options->dbTokenTable)
 				->set($values)
@@ -107,7 +107,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1){
+		if (is_bool($r) || $r->length < 1) {
 			throw new TokenStorageException('token not found');
 		}
 
@@ -187,7 +187,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1){
+		if (is_bool($r) || $r->length < 1) {
 			throw new TokenStorageException('state not found');
 		}
 
@@ -207,7 +207,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1 || empty(trim($r[0]->state))){
+		if (is_bool($r) || $r->length < 1 || empty(trim($r[0]->state))) {
 			return false;
 		}
 

bin/dbstorage_create.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-$CFGDIR         = __DIR__.'/../config';
+$CFGDIR = __DIR__.'/../config';
 const TABLE_TOKEN    = 'storagetest';
 const TABLE_PROVIDER = 'storagetest_providers';
 
@@ -71,22 +71,22 @@ 
 	->table(TABLE_TOKEN)
 	->primaryKey('label')
 	->varchar('label', 32, null, false)
-	->int('user_id',10, null, false)
+	->int('user_id', 10, null, false)
 	->varchar('provider_id', 30, '', false)
 	->text('token', null, true)
 	->text('state')
-	->int('expires',10, null, false)
+	->int('expires', 10, null, false)
 	->query();
 
 $db->raw('DROP TABLE IF EXISTS '.TABLE_PROVIDER);
 $db->create
 	->table(TABLE_PROVIDER)
 	->primaryKey('provider_id')
-	->tinyint('provider_id',10, null, false, 'UNSIGNED AUTO_INCREMENT')
+	->tinyint('provider_id', 10, null, false, 'UNSIGNED AUTO_INCREMENT')
 	->varchar('servicename', 30, '', false)
 	->query();
 
-foreach($providers as $i => $provider){
+foreach ($providers as $i => $provider) {
 	$db->insert
 		->into(TABLE_PROVIDER)
 		->values(['provider_id' => $i, 'servicename' => $provider])