chillerlan / php-oauth-core

src/OAuthOptionsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\OAuth;
 
-trait OAuthOptionsTrait{
+trait OAuthOptionsTrait {
 
 	/**
 	 * @var string
@@ -76,7 +76,7 @@ 
 	/**
 	 * @var string
 	 */
-	protected $dbLabelFormat   = '%1$s@%2$s'; // user@service
+	protected $dbLabelFormat = '%1$s@%2$s'; // user@service
 
 	/**
 	 * @var int|string

src/Storage/TokenStorageException.php

Spacing +1 added lines, -1 removed lines

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

src/Storage/SessionTokenStorage.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

@@ -21,7 +21,7 @@ 
  *      - the session is running through a session handler that already encrypts the session data. nothing to do here.
  *      - the session runs in memory - i think it's silly to encrypt there. sodium_memzero() galore!
  */
-class SessionTokenStorage extends TokenStorageAbstract{
+class SessionTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var bool
@@ -43,21 +43,21 @@ 
 	 *
 	 * @param \chillerlan\Traits\ContainerInterface|null $options
 	 */
-	public function __construct(ContainerInterface $options = null){
+	public function __construct(ContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->sessionVar = $this->options->sessionTokenVar;
 		$this->stateVar = $this->options->sessionStateVar;
 
-		if($this->options->sessionStart && !$this->sessionIsActive()){
+		if ($this->options->sessionStart && !$this->sessionIsActive()) {
 			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] = [];
 		}
 
@@ -66,8 +66,8 @@ 
 	/**
 	 * Destructor.
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -81,10 +81,10 @@ 
 	public function storeAccessToken(string $service, Token $token):TokenStorageInterface{
 		$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];
 		}
 
@@ -99,7 +99,7 @@ 
 	 */
 	public function getAccessToken(string $service):Token{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return (new Token)->__fromJSON($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -122,7 +122,7 @@ 
 	 */
 	public function clearAccessToken(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->sessionVar])){
+		if (array_key_exists($service, $_SESSION[$this->sessionVar])) {
 			unset($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -134,7 +134,7 @@ 
 	 */
 	public function clearAllAccessTokens():TokenStorageInterface{
 
-		foreach(array_keys($_SESSION[$this->sessionVar]) as $service){
+		foreach (array_keys($_SESSION[$this->sessionVar]) as $service) {
 			unset($_SESSION[$this->sessionVar][$service]); // trigger the memzero destructor
 		}
 
@@ -151,10 +151,10 @@ 
 	 */
 	public function storeCSRFState(string $service, string $state):TokenStorageInterface{
 
-		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];
 		}
 
@@ -169,7 +169,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -192,7 +192,7 @@ 
 	 */
 	public function clearCSRFState(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}
 

src/OAuthException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace chillerlan\OAuth;
 
-class OAuthException extends \Exception{}
+class OAuthException extends \Exception {}

src/Token.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
  * @property int    $expires
  * @property string $provider
  */
-class Token implements ContainerInterface{
+class Token implements ContainerInterface {
 	use MemzeroDestructorTrait, Container{
 		__construct as constructContainer;
 	}
@@ -98,7 +98,7 @@ 
 	 *
 	 * @param array|null $properties
 	 */
-	public function __construct(array $properties = null){
+	public function __construct(array $properties = null) {
 		$this->constructContainer($properties);
 
 		$this->setExpiry($this->expires);
@@ -112,9 +112,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set(string $property, $value){
+	public function __set(string $property, $value) {
 
-		if(property_exists($this, $property)){
+		if (property_exists($this, $property)) {
 			$property === 'expires'
 				? $this->setExpiry($value)
 				: $this->{$property} = $value;
@@ -130,19 +130,19 @@ 
 	public function setExpiry(int $expires = null):Token{
 		$now = time();
 
-		if($expires!== null){
-			$expires =  intval($expires);
+		if ($expires !== null) {
+			$expires = intval($expires);
 		}
 
 		$this->expires = $this::EOL_UNKNOWN;
 
-		if($expires === 0 || $expires === $this::EOL_NEVER_EXPIRES){
+		if ($expires === 0 || $expires === $this::EOL_NEVER_EXPIRES) {
 			$this->expires = $this::EOL_NEVER_EXPIRES;
 		}
-		elseif($expires > $now){
+		elseif ($expires > $now) {
 			$this->expires = $expires;
 		}
-		elseif($expires > 0 && $expires < $this::EXPIRY_MAX){
+		elseif ($expires > 0 && $expires < $this::EXPIRY_MAX) {
 			$this->expires = $now + $expires;
 		}
 

Braces +2 added lines, -4 removed lines

@@ -138,11 +138,9 @@
 
 		if($expires === 0 || $expires === $this::EOL_NEVER_EXPIRES){
 			$this->expires = $this::EOL_NEVER_EXPIRES;
-		}
-		elseif($expires > $now){
+		} elseif($expires > $now){
 			$this->expires = $expires;
-		}
-		elseif($expires > 0 && $expires < $this::EXPIRY_MAX){
+		} elseif($expires > 0 && $expires < $this::EXPIRY_MAX){
 			$this->expires = $now + $expires;
 		}
 

src/OAuthOptions.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
  * @property string     $ca_info
  * @property int        $max_redirects
  */
-class OAuthOptions implements ContainerInterface{
+class OAuthOptions implements ContainerInterface {
 	use OAuthOptionsTrait, HTTPOptionsTrait, MemzeroDestructorTrait, Container{
 		__construct as protected containerConstruct;
 	}
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param array|null $properties
 	 */
-	public function __construct(array $properties = null){
+	public function __construct(array $properties = null) {
 		// enable encryption by default if possible...
 		$this->useEncryption = extension_loaded('sodium');
 

src/Providers/OAuth2Provider.php

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');
 		}
 

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,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
@@ -62,10 +62,10 @@ 
 	 * @param \Psr\Log\LoggerInterface|null                   $logger
 	 * @param array                                           $scopes
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger = null, array $scopes = null){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger = null, array $scopes = null) {
 		parent::__construct($http, $storage, $options, $logger);
 
-		if($scopes !== null){
+		if ($scopes !== null) {
 			$this->scopes = $scopes;
 		}
 
@@ -79,7 +79,7 @@ 
 	public function getAuthURL(array $params = null):string{
 		$params = $this->getAuthURLParams($params ?? []);
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -94,7 +94,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']);
 		}
 
@@ -116,19 +116,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');
 		}
 
@@ -154,7 +154,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):Token{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -208,7 +208,7 @@ 
 		$token = $this->storage->getAccessToken($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);
 		}
 
@@ -217,15 +217,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');
 		}
 

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