chillerlan / php-oauth-core

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 ImmutableSettingsInterface{
+class OAuthOptions implements ImmutableSettingsInterface {
 	use OAuthOptionsTrait, HTTPOptionsTrait, MemzeroDestructorTrait, ImmutableSettingsContainer{
 		__construct as protected containerConstruct;
 	}
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 		// enable encryption by default if possible...
 		$this->useEncryption = extension_loaded('sodium');
 

src/Core/AccessToken.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
  * @property int    $expires
  * @property string $provider
  */
-class AccessToken implements ImmutableSettingsInterface{
+class AccessToken implements ImmutableSettingsInterface {
 	use MemzeroDestructorTrait, ImmutableSettingsContainer{
 		__construct as constructContainer;
 	}
@@ -98,7 +98,7 @@ 
 	 *
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 		$this->constructContainer($properties);
 
 		$this->setExpiry($this->expires);
@@ -114,7 +114,7 @@ 
 	 */
 	public function __set(string $property, $value):void{
 
-		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):AccessToken{
 		$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;
 		}
 

src/Core/OAuthProvider.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 * @param \chillerlan\Traits\ImmutableSettingsInterface           $options
 	 * @param \Psr\Log\LoggerInterface|null                   $logger
 	 */
-	public function __construct(HTTPClientInterface $http, OAuthStorageInterface $storage, ImmutableSettingsInterface $options, LoggerInterface $logger = null){
+	public function __construct(HTTPClientInterface $http, OAuthStorageInterface $storage, ImmutableSettingsInterface $options, LoggerInterface $logger = null) {
 		$this->setHTTPClient($http);
 
 		$this->storage     = $storage;
@@ -99,7 +99,7 @@ 
 
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
-		if($this instanceof ApiClientInterface){
+		if ($this instanceof ApiClientInterface) {
 			$this->loadEndpoints();
 		}
 

src/Core/OAuth2Provider.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
  * @method array setState(array $params)
  * @method \chillerlan\OAuth\Core\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, OAuthStorageInterface $storage, ImmutableSettingsInterface $options, LoggerInterface $logger = null, array $scopes = null){
+	public function __construct(HTTPClientInterface $http, OAuthStorageInterface $storage, ImmutableSettingsInterface $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):AccessToken{
 		$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):AccessToken{
 
-		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/Storage/DBStorage.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\OAuth\Core\AccessToken;
 use chillerlan\Traits\ImmutableSettingsInterface;
 
-class DBStorage extends OAuthStorageAbstract{
+class DBStorage extends OAuthStorageAbstract {
 
 	/**
 	 * @var \chillerlan\Database\Database
@@ -31,10 +31,10 @@ 
 	 *
 	 * @throws \chillerlan\OAuth\Storage\OAuthStorageException
 	 */
-	public function __construct(ImmutableSettingsInterface $options, Database $db){
+	public function __construct(ImmutableSettingsInterface $options, Database $db) {
 		parent::__construct($options);
 
-		if(!$this->options->dbTokenTable || !$this->options->dbProviderTable){
+		if (!$this->options->dbTokenTable || !$this->options->dbProviderTable) {
 			throw new OAuthStorageException('invalid table config');
 		}
 
@@ -62,7 +62,7 @@ 
 	public function storeAccessToken(string $service, AccessToken $token):OAuthStorageInterface{
 		$providers = $this->getProviders();
 
-		if(empty($providers) || !isset($providers[$service])){
+		if (empty($providers) || !isset($providers[$service])) {
 			throw new OAuthStorageException('unknown service');
 		}
 
@@ -73,7 +73,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)
@@ -107,7 +107,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 OAuthStorageException('token not found');
 		}
 
@@ -187,7 +187,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 OAuthStorageException('state not found');
 		}
 
@@ -207,7 +207,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/OAuthStorageAbstract.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
 	 * @param \Psr\Log\LoggerInterface|null              $logger
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null, LoggerInterface $logger = null){
+	public function __construct(ImmutableSettingsInterface $options = null, LoggerInterface $logger = null) {
 		$this->options = $options ?? new OAuthOptions;
 		$this->logger  = $logger ?? new NullLogger;
 	}
@@ -49,7 +49,7 @@ 
 
 		unset($token);
 
-		if($this->options->useEncryption === true){
+		if ($this->options->useEncryption === true) {
 			return $this->encrypt($data);
 		}
 
@@ -63,7 +63,7 @@ 
 	 */
 	public function fromStorage(string $data):AccessToken{
 
-		if($this->options->useEncryption === true){
+		if ($this->options->useEncryption === true) {
 			$data = $this->decrypt($data);
 		}
 
@@ -78,7 +78,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);
@@ -97,7 +97,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/Storage/SessionStorage.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\OAuth\Core\AccessToken;
 use chillerlan\Traits\ImmutableSettingsInterface;
 
-class SessionStorage extends OAuthStorageAbstract{
+class SessionStorage extends OAuthStorageAbstract {
 
 	/**
 	 * @var bool
@@ -37,21 +37,21 @@ 
 	 *
 	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null){
+	public function __construct(ImmutableSettingsInterface $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] = [];
 		}
 
@@ -62,8 +62,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -77,10 +77,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];
 		}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return (new AccessToken)->__fromJSON($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -118,7 +118,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]);
 		}
 
@@ -130,7 +130,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]); // trigger the memzero destructor
 		}
 
@@ -147,10 +147,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];
 		}
 
@@ -165,7 +165,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -188,7 +188,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]);
 		}