chillerlan / php-oauth-core

src/Core/OAuth1Provider.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 use DateTime;
 use Psr\Http\Message\{RequestInterface, ResponseInterface, UriInterface};
 
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * @var string
@@ -62,7 +62,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -79,17 +79,17 @@ 
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
 		\parse_str(Psr7\decompress_content($response), $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('invalid token');
 		}
 
-		if($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')){
+		if ($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -135,7 +135,7 @@ 
 	protected function getSignature(string $url, array $params, string $method, string $accessTokenSecret = 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');
 		}
 
@@ -143,7 +143,7 @@ 
 
 		$signatureParams = \array_merge($query, $params);
 
-		if(isset($signatureParams['oauth_signature'])){
+		if (isset($signatureParams['oauth_signature'])) {
 			unset($signatureParams['oauth_signature']);
 		}
 
@@ -201,7 +201,7 @@ 
 			$token->accessTokenSecret
 		);
 
-		if(isset($query['oauth_session_handle'])){
+		if (isset($query['oauth_session_handle'])) {
 			$parameters['oauth_session_handle'] = $query['oauth_session_handle']; // @codeCoverageIgnore
 		}
 

Braces +2 added lines, -4 removed lines

@@ -81,11 +81,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('invalid token');
 		}
 

src/Storage/SessionStorage.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\OAuth\Core\AccessToken;
 use chillerlan\Settings\SettingsContainerInterface;
 
-class SessionStorage extends OAuthStorageAbstract{
+class SessionStorage extends OAuthStorageAbstract {
 
 	/**
 	 * @var string
@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->sessionVar = $this->options->sessionTokenVar;
@@ -40,15 +40,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->sessionVar])){
+		if (!isset($_SESSION[$this->sessionVar])) {
 			$_SESSION[$this->sessionVar] = [];
 		}
 
-		if(!isset($_SESSION[$this->stateVar])){
+		if (!isset($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar] = [];
 		}
 
@@ -59,8 +59,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			\session_write_close();
 		}
 	}
@@ -74,10 +74,10 @@ 
 	public function storeAccessToken(string $service, AccessToken $token):OAuthStorageInterface{
 		$data = $this->toStorage($token);
 
-		if(isset($_SESSION[$this->sessionVar]) && \is_array($_SESSION[$this->sessionVar])){
+		if (isset($_SESSION[$this->sessionVar]) && \is_array($_SESSION[$this->sessionVar])) {
 			$_SESSION[$this->sessionVar][$service] = $data;
 		}
-		else{
+		else {
 			$_SESSION[$this->sessionVar] = [$service => $data];
 		}
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->fromStorage($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -115,7 +115,7 @@ 
 	 */
 	public function clearAccessToken(string $service):OAuthStorageInterface{
 
-		if(\array_key_exists($service, $_SESSION[$this->sessionVar])){
+		if (\array_key_exists($service, $_SESSION[$this->sessionVar])) {
 			unset($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -127,7 +127,7 @@ 
 	 */
 	public function clearAllAccessTokens():OAuthStorageInterface{
 
-		foreach(\array_keys($_SESSION[$this->sessionVar]) as $service){
+		foreach (\array_keys($_SESSION[$this->sessionVar]) as $service) {
 			unset($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -144,10 +144,10 @@ 
 	 */
 	public function storeCSRFState(string $service, string $state):OAuthStorageInterface{
 
-		if(isset($_SESSION[$this->stateVar]) && \is_array($_SESSION[$this->stateVar])){
+		if (isset($_SESSION[$this->stateVar]) && \is_array($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar][$service] = $state;
 		}
-		else{
+		else {
 			$_SESSION[$this->stateVar] = [$service => $state];
 		}
 
@@ -162,7 +162,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -185,7 +185,7 @@ 
 	 */
 	public function clearCSRFState(string $service):OAuthStorageInterface{
 
-		if(\array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (\array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}
 

Braces +2 added lines, -4 removed lines

@@ -76,8 +76,7 @@ 
 
 		if(isset($_SESSION[$this->sessionVar]) && \is_array($_SESSION[$this->sessionVar])){
 			$_SESSION[$this->sessionVar][$service] = $data;
-		}
-		else{
+		} else{
 			$_SESSION[$this->sessionVar] = [$service => $data];
 		}
 
@@ -146,8 +145,7 @@ 
 
 		if(isset($_SESSION[$this->stateVar]) && \is_array($_SESSION[$this->stateVar])){
 			$_SESSION[$this->stateVar][$service] = $state;
-		}
-		else{
+		} else{
 			$_SESSION[$this->stateVar] = [$service => $state];
 		}
 

src/Storage/MemoryStorage.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\OAuth\Core\AccessToken;
 
-class MemoryStorage extends OAuthStorageAbstract{
+class MemoryStorage extends OAuthStorageAbstract {
 
 	/**
 	 * @var array
@@ -46,7 +46,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -69,7 +69,7 @@ 
 	 */
 	public function clearAccessToken(string $service):OAuthStorageInterface{
 
-		if(\array_key_exists($service, $this->tokens)){
+		if (\array_key_exists($service, $this->tokens)) {
 			unset($this->tokens[$service]);
 		}
 
@@ -81,7 +81,7 @@ 
 	 */
 	public function clearAllAccessTokens():OAuthStorageInterface{
 
-		foreach(\array_keys($this->tokens) as $service){
+		foreach (\array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]);
 		}
 
@@ -110,7 +110,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$service];
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function clearCSRFState(string $service):OAuthStorageInterface{
 
-		if(\array_key_exists($service, $this->states)){
+		if (\array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

src/Core/OAuthInterface.php

Spacing +1 added lines, -1 removed lines

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

src/Core/CSRFToken.php

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
  * checkState(string $state = null):void
  * setState(array $params):array
  */
-interface CSRFToken{
+interface CSRFToken {
 
 }