chillerlan / php-oauth-core

src/Providers/OAuth2Provider.php

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
  * @method array setState(array $params)
  * @method \chillerlan\OAuth\Providers\OAuth2Interface checkState(string $state = null)
  */
-abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
+abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface {
 
 	/**
 	 * @var int
@@ -60,7 +60,7 @@ 
 	 * @param \chillerlan\Traits\ContainerInterface           $options
 	 * @param array                                           $scopes
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, array $scopes = null){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, array $scopes = null) {
 		parent::__construct($http, $storage, $options);
 
 		$this->scopes = $scopes ?? [];
@@ -74,7 +74,7 @@ 
 	public function getAuthURL(array $params = null):string{
 		$params = $this->getAuthURLParams($params ?? []);
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -89,7 +89,7 @@ 
 	protected function getAuthURLParams(array $params):array {
 
 		// this should not be here
-		if(isset($params['client_secret'])){
+		if (isset($params['client_secret'])) {
 			unset($params['client_secret']);
 		}
 
@@ -111,19 +111,19 @@ 
 	protected function parseTokenResponse(HTTPResponseInterface $response):Token{
 		$data = $response->json_array;
 
-		if(!is_array($data)){
+		if (!is_array($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
 
-		foreach(['error_description', 'error'] as $field){
+		foreach (['error_description', 'error'] as $field) {
 
-			if(isset($data[$field])){
+			if (isset($data[$field])) {
 				throw new ProviderException('error retrieving access token: "'.$data[$field].'"');
 			}
 
 		}
 
-		if(!isset($data['access_token'])){
+		if (!isset($data['access_token'])) {
 			throw new ProviderException('token missing');
 		}
 
@@ -149,7 +149,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):Token{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -203,7 +203,7 @@ 
 		$token = $this->storage->retrieveAccessToken($this->serviceName);
 
 		// attempt to refresh an expired token
-		if($this->options->tokenAutoRefresh && $this instanceof TokenRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
+		if ($this->options->tokenAutoRefresh && $this instanceof TokenRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)) {
 			$token = $this->refreshAccessToken($token);
 		}
 
@@ -212,15 +212,15 @@ 
 		$params  = array_merge($query, $params ?? []);
 		$headers = $headers ?? [];
 
-		if(array_key_exists($this->authMethod, $this::AUTH_METHODS_HEADER)){
+		if (array_key_exists($this->authMethod, $this::AUTH_METHODS_HEADER)) {
 			$headers = array_merge($headers, [
 				'Authorization' => $this::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken,
 			]);
 		}
-		elseif(array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)){
+		elseif (array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)) {
 			$params[$this::AUTH_METHODS_QUERY[$this->authMethod]] = $token->accessToken;
 		}
-		else{
+		else {
 			throw new ProviderException('invalid auth type');
 		}
 

Braces +2 added lines, -4 removed lines

@@ -216,11 +216,9 @@
 			$headers = array_merge($headers, [
 				'Authorization' => $this::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken,
 			]);
-		}
-		elseif(array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)){
+		} elseif(array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)){
 			$params[$this::AUTH_METHODS_QUERY[$this->authMethod]] = $token->accessToken;
-		}
-		else{
+		} else{
 			throw new ProviderException('invalid auth type');
 		}
 

src/Providers/OAuth2TokenRefreshTrait.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  * @property \chillerlan\OAuth\Storage\TokenStorageInterface $storage
  * @property \chillerlan\OAuth\OAuthOptions $options
  */
-trait OAuth2TokenRefreshTrait{
+trait OAuth2TokenRefreshTrait {
 
 	/**
 	 * @param \chillerlan\OAuth\Token $token
@@ -31,15 +31,15 @@ 
 	 */
 	public function refreshAccessToken(Token $token = null):Token{
 
-		if($token === null){
+		if ($token === null) {
 			$token = $this->storage->retrieveAccessToken($this->serviceName);
 		}
 
 		$refreshToken = $token->refreshToken;
 
-		if(empty($refreshToken)){
+		if (empty($refreshToken)) {
 
-			if(!$this instanceof AccessTokenForRefresh){
+			if (!$this instanceof AccessTokenForRefresh) {
 				throw new ProviderException(sprintf('no refresh token available, token expired [%s]', date('Y-m-d h:i:s A', $token->expires)));
 			}
 
@@ -55,7 +55,7 @@ 
 			)
 		);
 
-		if(!$newToken->refreshToken){
+		if (!$newToken->refreshToken) {
 			$newToken->refreshToken = $refreshToken;
 		}
 

src/Providers/AccessTokenForRefresh.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 namespace chillerlan\OAuth\Providers;
 
-interface AccessTokenForRefresh{
+interface AccessTokenForRefresh {
 
 }

src/Providers/OAuth2ClientCredentialsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  * @property string $accessTokenURL
  * @property \chillerlan\OAuth\Storage\TokenStorageInterface $storage
  */
-trait OAuth2ClientCredentialsTrait{
+trait OAuth2ClientCredentialsTrait {
 
 	/**
 	 * @param array $scopes

src/Providers/CSRFToken.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 namespace chillerlan\OAuth\Providers;
 
-interface CSRFToken{
+interface CSRFToken {
 
 }

src/Providers/CSRFTokenTrait.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
  * @property string $serviceName
  * @property \chillerlan\OAuth\Storage\TokenStorageInterface $storage
  */
-trait CSRFTokenTrait{
+trait CSRFTokenTrait {
 
 	/**
 	 * @param string|null $state
@@ -28,13 +28,13 @@ 
 	 */
 	protected function checkState(string $state = null):OAuth2Interface{
 
-		if(empty($state) || !$this->storage->hasAuthorizationState($this->serviceName)){
+		if (empty($state) || !$this->storage->hasAuthorizationState($this->serviceName)) {
 			throw new ProviderException('invalid state for '.$this->serviceName);
 		}
 
 		$knownState = $this->storage->retrieveAuthorizationState($this->serviceName);
 
-		if(!hash_equals($knownState, $state)){
+		if (!hash_equals($knownState, $state)) {
 			throw new ProviderException('invalid authorization state: '.$this->serviceName.' '.$state);
 		}
 
@@ -48,7 +48,7 @@ 
 	 */
 	protected function setState(array $params):array {
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}
 

src/Providers/ProviderException.php

Spacing +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
 
 use chillerlan\OAuth\OAuthException;
 
-class ProviderException extends OAuthException{}
+class ProviderException extends OAuthException {}

src/Providers/TokenRefresh.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Token;
 
-interface TokenRefresh{
+interface TokenRefresh {
 
 	/**
 	 * @param \chillerlan\OAuth\Token|null $token

src/Providers/OAuthInterface.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @property string $serviceName
  * @property string $userRevokeURL
  */
-interface OAuthInterface{
+interface OAuthInterface {
 
 	/**
 	 * @param array $params