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/API/OAuthAPIClientException.php

Spacing +1 added lines, -1 removed lines

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

src/Storage/TokenStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Token;
 
-interface TokenStorageInterface{
+interface TokenStorageInterface {
 
 	/**
 	 * @param string                  $service

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/MemoryTokenStorage.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\OAuth\Token;
 
-class MemoryTokenStorage extends TokenStorageAbstract{
+class MemoryTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var array
@@ -46,7 +46,7 @@ 
 	 */
 	public function retrieveAccessToken(string $service):Token{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -69,7 +69,7 @@ 
 	 */
 	public function clearAccessToken(string $service):TokenStorageInterface{
 
-		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():TokenStorageInterface{
 
-		foreach(array_keys($this->tokens) as $service){
+		foreach (array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]); // trigger the memzero destructor
 		}
 
@@ -110,7 +110,7 @@ 
 	 */
 	public function retrieveAuthorizationState(string $service):string{
 
-		if($this->hasAuthorizationState($service)){
+		if ($this->hasAuthorizationState($service)) {
 			return $this->states[$service];
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function clearAuthorizationState(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

src/Storage/SessionTokenStorage.php

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 retrieveAccessToken(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 storeAuthorizationState(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 retrieveAuthorizationState(string $service):string{
 
-		if($this->hasAuthorizationState($service)){
+		if ($this->hasAuthorizationState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -192,7 +192,7 @@ 
 	 */
 	public function clearAuthorizationState(string $service):TokenStorageInterface{
 
-		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

@@ -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];
 		}
 

src/Storage/DBTokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\OAuth\Token;
 use chillerlan\Traits\ContainerInterface;
 
-class DBTokenStorage extends TokenStorageAbstract{
+class DBTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var \chillerlan\Database\Database
@@ -31,10 +31,10 @@ 
 	 *
 	 * @throws \chillerlan\OAuth\Storage\TokenStorageException
 	 */
-	public function __construct(ContainerInterface $options, Database $db){
+	public function __construct(ContainerInterface $options, Database $db) {
 		parent::__construct($options);
 
-		if(!$this->options->dbTokenTable || !$this->options->dbProviderTable){
+		if (!$this->options->dbTokenTable || !$this->options->dbProviderTable) {
 			throw new TokenStorageException('invalid table config');
 		}
 
@@ -61,7 +61,7 @@ 
 	 */
 	public function storeAccessToken(string $service, Token $token):TokenStorageInterface{
 
-		if(!isset($this->getProviders()[$service])){
+		if (!isset($this->getProviders()[$service])) {
 			throw new TokenStorageException('unknown service');
 		}
 
@@ -72,7 +72,7 @@ 
 			$this->options->dbTokenTableExpires    => $token->expires,
 		];
 
-		if($this->hasAccessToken($service) === true){
+		if ($this->hasAccessToken($service) === true) {
 			$this->db->update
 				->table($this->options->dbTokenTable)
 				->set($values)
@@ -106,7 +106,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1){
+		if (is_bool($r) || $r->length < 1) {
 			throw new TokenStorageException('token not found');
 		}
 
@@ -186,7 +186,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1){
+		if (is_bool($r) || $r->length < 1) {
 			throw new TokenStorageException('state not found');
 		}
 
@@ -206,7 +206,7 @@ 
 			->where($this->options->dbTokenTableLabel, $this->getLabel($service))
 			->query();
 
-		if(is_bool($r) || $r->length < 1 || empty(trim($r[0]->state))){
+		if (is_bool($r) || $r->length < 1 || empty(trim($r[0]->state))) {
 			return false;
 		}
 

src/Storage/TokenStorageAbstract.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \chillerlan\Traits\ContainerInterface|null $options
 	 */
-	public function __construct(ContainerInterface $options = null){
+	public function __construct(ContainerInterface $options = null) {
 		$this->options = $options ?? new OAuthOptions;
 	}
 
@@ -46,7 +46,7 @@ 
 
 		unset($token);
 
-		if($this->options->useEncryption === true){
+		if ($this->options->useEncryption === true) {
 			return $this->encrypt($data);
 		}
 
@@ -60,7 +60,7 @@ 
 	 */
 	public function fromStorage(string $data):Token{
 
-		if($this->options->useEncryption === true){
+		if ($this->options->useEncryption === true) {
 			$data = $this->decrypt($data);
 		}
 
@@ -75,7 +75,7 @@ 
 	 */
 	protected function encrypt(string &$data):string {
 
-		if(function_exists('sodium_crypto_secretbox')){
+		if (function_exists('sodium_crypto_secretbox')) {
 			$box = sodium_crypto_secretbox($data, $this::TOKEN_NONCE, sodium_hex2bin($this->options->storageCryptoKey));
 
 			sodium_memzero($data);
@@ -94,7 +94,7 @@ 
 	 */
 	protected function decrypt(string $box):string {
 
-		if(function_exists('sodium_crypto_secretbox_open')){
+		if (function_exists('sodium_crypto_secretbox_open')) {
 			return sodium_crypto_secretbox_open(sodium_hex2bin($box), $this::TOKEN_NONCE, sodium_hex2bin($this->options->storageCryptoKey));
 		}
 

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 {}