chillerlan / php-oauth-core

src/OAuthOptionsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 /**
  * The settings for the OAuth provider
  */
-trait OAuthOptionsTrait{
+trait OAuthOptionsTrait {
 
 	/**
 	 * The application key (or id) given by your provider

src/Core/ClientCredentials.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @link https://tools.ietf.org/html/rfc6749#section-4.4
  */
-interface ClientCredentials{
+interface ClientCredentials {
 
 	/**
 	 * Obtains an OAuth2 client credentials token and returns an AccessToken

src/Core/OAuth1Interface.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 /**
  * Specifies the basic methods for an OAuth1 provider.
  */
-interface OAuth1Interface extends OAuthInterface{
+interface OAuth1Interface extends OAuthInterface {
 
 	/**
 	 * Obtains an OAuth1 request token and returns an AccessToken object for use in the authentication request.

src/Core/CSRFToken.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @link https://tools.ietf.org/html/rfc6749#section-10.12
  */
-interface CSRFToken{
+interface CSRFToken {
 
 	/**
 	 * Checks whether the CSRF state was set and verifies against the last known state.

src/Core/OAuth1Provider.php

Braces +2 added lines, -4 removed lines

@@ -83,11 +83,9 @@
 
 		if(empty($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('invalid token');
 		}
 

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 /**
  * Implements an abstract OAuth1 provider with all methods required by the OAuth1Interface.
  */
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * The request OAuth1 token URL
@@ -67,7 +67,7 @@ 
 			->withHeader('Content-Length', '0') // tumblr requires a content-length header set
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -84,20 +84,20 @@ 
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
 		$data = QueryUtil::parse(MessageUtil::decompress($response));
 
-		if(empty($data)){
+		if (empty($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('invalid token');
 		}
 
-		if(
+		if (
 			$checkCallbackConfirmed
 			&& (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')
-		){
+		) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -133,7 +133,7 @@ 
 	protected function getSignature(string $url, array $params, string $method, string $accessTokenSecret = null):string{
 		$parsed = QueryUtil::parseUrl($url);
 
-		if(!isset($parsed['host']) || !isset($parsed['scheme']) || !in_array($parsed['scheme'], ['http', 'https'], true)){
+		if (!isset($parsed['host']) || !isset($parsed['scheme']) || !in_array($parsed['scheme'], ['http', 'https'], true)) {
 			throw new ProviderException('getSignature: invalid url');
 		}
 
@@ -150,7 +150,7 @@ 
 		]);
 
 		// https://tools.ietf.org/html/rfc5849#section-3.4.2
-		$key  = array_map('rawurlencode', [
+		$key = array_map('rawurlencode', [
 			$this->options->secret,
 			($accessTokenSecret ?? ''),
 		]);
@@ -197,7 +197,7 @@ 
 			$token->accessTokenSecret
 		);
 
-		if(isset($query['oauth_session_handle'])){
+		if (isset($query['oauth_session_handle'])) {
 			$parameters['oauth_session_handle'] = $query['oauth_session_handle']; // @codeCoverageIgnore
 		}
 

src/OAuthOptions.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 /**
  * This class holds all settings related to the OAuth provider as well as the default HTTP client.
  */
-class OAuthOptions extends SettingsContainerAbstract{
+class OAuthOptions extends SettingsContainerAbstract {
 	use OAuthOptionsTrait, HTTPOptionsTrait;
 }

src/Storage/MemoryStorage.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Implements a memory storage adapter. Memory storage is not persistent as tokens are only stored during script runtime.
  */
-class MemoryStorage extends OAuthStorageAbstract{
+class MemoryStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the token storage array
@@ -43,7 +43,7 @@ 
 	 */
 	public function getAccessToken(string $service = null):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$this->getServiceName($service)];
 		}
 
@@ -65,7 +65,7 @@ 
 	public function clearAccessToken(string $service = null):OAuthStorageInterface{
 		$serviceName = $this->getServiceName($service);
 
-		if(array_key_exists($serviceName, $this->tokens)){
+		if (array_key_exists($serviceName, $this->tokens)) {
 			unset($this->tokens[$serviceName]);
 		}
 
@@ -77,7 +77,7 @@ 
 	 */
 	public function clearAllAccessTokens():OAuthStorageInterface{
 
-		foreach(array_keys($this->tokens) as $service){
+		foreach (array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]);
 		}
 
@@ -100,7 +100,7 @@ 
 	 */
 	public function getCSRFState(string $service = null):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$this->getServiceName($service)];
 		}
 
@@ -122,7 +122,7 @@ 
 	public function clearCSRFState(string $service = null):OAuthStorageInterface{
 		$serviceName = $this->getServiceName($service);
 
-		if(array_key_exists($serviceName, $this->states)){
+		if (array_key_exists($serviceName, $this->states)) {
 			unset($this->states[$serviceName]);
 		}
 

src/Storage/SessionStorage.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
 /**
  * Implements a session storage adapter. Session storage is half persistent as tokens are stored for the duration of the session.
  */
-class SessionStorage extends OAuthStorageAbstract{
+class SessionStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the key name for the token storage array in $_SESSION
@@ -38,7 +38,7 @@ 
 	/**
 	 * SessionStorage constructor.
 	 */
-	public function __construct(OAuthOptions|SettingsContainerInterface $options = null){
+	public function __construct(OAuthOptions|SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->tokenVar = $this->options->sessionTokenVar;
@@ -46,15 +46,15 @@ 
 
 		// Determine if the session has started.
 		// @link http://stackoverflow.com/a/18542272/1470961
-		if($this->options->sessionStart && !(session_status() !== PHP_SESSION_NONE)){
+		if ($this->options->sessionStart && !(session_status() !== PHP_SESSION_NONE)) {
 			session_start();
 		}
 
-		if(!isset($_SESSION[$this->tokenVar])){
+		if (!isset($_SESSION[$this->tokenVar])) {
 			$_SESSION[$this->tokenVar] = [];
 		}
 
-		if(!isset($_SESSION[$this->stateVar])){
+		if (!isset($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar] = [];
 		}
 
@@ -65,8 +65,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -85,7 +85,7 @@ 
 	 */
 	public function getAccessToken(string $service = null):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->fromStorage($_SESSION[$this->tokenVar][$this->getServiceName($service)]);
 		}
 
@@ -105,7 +105,7 @@ 
 	public function clearAccessToken(string $service = null):OAuthStorageInterface{
 		$serviceName = $this->getServiceName($service);
 
-		if(array_key_exists($serviceName, $_SESSION[$this->tokenVar])){
+		if (array_key_exists($serviceName, $_SESSION[$this->tokenVar])) {
 			unset($_SESSION[$this->tokenVar][$serviceName]);
 		}
 
@@ -117,7 +117,7 @@ 
 	 */
 	public function clearAllAccessTokens():OAuthStorageInterface{
 
-		foreach(array_keys($_SESSION[$this->tokenVar]) as $service){
+		foreach (array_keys($_SESSION[$this->tokenVar]) as $service) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -140,7 +140,7 @@ 
 	 */
 	public function getCSRFState(string $service = null):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$this->getServiceName($service)];
 		}
 
@@ -160,7 +160,7 @@ 
 	public function clearCSRFState(string $service = null):OAuthStorageInterface{
 		$serviceName = $this->getServiceName($service);
 
-		if(array_key_exists($serviceName, $_SESSION[$this->stateVar])){
+		if (array_key_exists($serviceName, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$serviceName]);
 		}
 

src/Storage/OAuthStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 /**
  * Specifies the methods required for an OAuth storage adapter
  */
-interface OAuthStorageInterface extends LoggerAwareInterface{
+interface OAuthStorageInterface extends LoggerAwareInterface {
 
 	/**
 	 * Sets the current service provider name