chillerlan / php-oauth-core

src/Storage/OAuthStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Core\AccessToken;
 
-interface OAuthStorageInterface{
+interface OAuthStorageInterface {
 
 	/**
 	 * @param string                             $service

src/Storage/SessionStorage.php

Braces +2 added lines, -4 removed lines

@@ -83,8 +83,7 @@ 
 
 		if(isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])){
 			$_SESSION[$this->sessionVar][$service] = $token;
-		}
-		else{
+		} else{
 			$_SESSION[$this->sessionVar] = [$service => $token];
 		}
 
@@ -153,8 +152,7 @@ 
 
 		if(isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])){
 			$_SESSION[$this->stateVar][$service] = $state;
-		}
-		else{
+		} else{
 			$_SESSION[$this->stateVar] = [$service => $state];
 		}
 

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{
 		$token = $token->toJSON();
 
-		if(isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])){
+		if (isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])) {
 			$_SESSION[$this->sessionVar][$service] = $token;
 		}
-		else{
+		else {
 			$_SESSION[$this->sessionVar] = [$service => $token];
 		}
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return (new AccessToken)->fromJSON($_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]);
 		}
 

src/Core/OAuth2TokenRefreshTrait.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
  * @property \Psr\Http\Message\RequestFactoryInterface       $requestFactory
  * @property \Psr\Http\Message\StreamFactoryInterface        $streamFactory
  */
-trait OAuth2TokenRefreshTrait{
+trait OAuth2TokenRefreshTrait {
 
 	/**
 	 * @param \chillerlan\OAuth\Core\AccessToken $token
@@ -34,15 +34,15 @@ 
 	 */
 	public function refreshAccessToken(AccessToken $token = null):AccessToken{
 
-		if($token === null){
+		if ($token === null) {
 			$token = $this->storage->getAccessToken($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)));
 			}
 
@@ -63,13 +63,13 @@ 
 			->withBody($this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738)))
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
 		$newToken = $this->parseTokenResponse($this->http->sendRequest($request));
 
-		if(empty($newToken->refreshToken)){
+		if (empty($newToken->refreshToken)) {
 			$newToken->refreshToken = $refreshToken;
 		}
 

src/Core/OAuth2ClientCredentialsTrait.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
  * @property \Psr\Http\Message\RequestFactoryInterface       $requestFactory
  * @property \Psr\Http\Message\StreamFactoryInterface        $streamFactory
  */
-trait OAuth2ClientCredentialsTrait{
+trait OAuth2ClientCredentialsTrait {
 
 	/**
 	 * @param array $scopes
@@ -34,7 +34,7 @@ 
 	public function getClientCredentialsToken(array $scopes = null):AccessToken{
 		$params = ['grant_type' => 'client_credentials'];
 
-		if($scopes !== null){
+		if ($scopes !== null) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
@@ -45,7 +45,7 @@ 
 			->withBody($this->streamFactory->createStream(http_build_query($params, '', '&', PHP_QUERY_RFC1738)))
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 

src/OAuthOptionsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\OAuth;
 
-trait OAuthOptionsTrait{
+trait OAuthOptionsTrait {
 
 	/**
 	 * @var string

src/Storage/OAuthStorageAbstract.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\OAuth\{Core\AccessToken, OAuthOptions};
 use chillerlan\Settings\SettingsContainerInterface;
 
-abstract class OAuthStorageAbstract implements OAuthStorageInterface{
+abstract class OAuthStorageAbstract implements OAuthStorageInterface {
 
 	/**
 	 * @var \chillerlan\OAuth\OAuthOptions
@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		$this->options = $options ?? new OAuthOptions;
 	}
 

examples/OAuth1Testprovider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Core\OAuth1Provider;
 
-class OAuth1Testprovider extends OAuth1Provider{
+class OAuth1Testprovider extends OAuth1Provider {
 
 	protected $apiURL          = 'https://api.example.com';
 	protected $requestTokenURL = 'https://example.com/oauth/request_token';

examples/TestEndpoints.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\HTTP\MagicAPI\EndpointMap;
 
-class TestEndpoints extends EndpointMap{
+class TestEndpoints extends EndpointMap {
 
 	protected $test = [
 		'path'          => '/test/%1$s',

examples/OAuth2Testprovider.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	protected $authURL        = 'https://example.com/oauth2/authorize';
 	protected $accessTokenURL = 'https://example.com/oauth2/token';
 	protected $userRevokeURL  = 'https://account.example.com/apps/';
-	protected $endpointMap     = TestEndpoints::class;
+	protected $endpointMap = TestEndpoints::class;
 	protected $authHeaders    = ['foo' => 'bar'];
 	protected $apiHeaders     = ['foo' => 'bar'];