chillerlan / php-oauth-core

src/Storage/OAuthStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 use chillerlan\OAuth\Core\AccessToken;
 use Psr\Log\LoggerAwareInterface;
 
-interface OAuthStorageInterface extends LoggerAwareInterface{
+interface OAuthStorageInterface extends LoggerAwareInterface {
 
 	/**
 	 * Stores an AccessToken for the given $service

src/Storage/OAuthStorageAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
 use function is_string;
 
-abstract class OAuthStorageAbstract implements OAuthStorageInterface{
+abstract class OAuthStorageAbstract implements OAuthStorageInterface {
 	use LoggerAwareTrait;
 
 	/**
@@ -32,7 +32,7 @@ 
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 * @param \Psr\Log\LoggerInterface|null                        $logger
 	 */
-	public function __construct(SettingsContainerInterface $options = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options = null, LoggerInterface $logger = null) {
 		$this->options = $options ?? new OAuthOptions;
 
 		$this->setLogger($logger ?? new NullLogger);
@@ -54,7 +54,7 @@ 
 	 */
 	public function fromStorage($data):AccessToken{
 
-		if(!is_string($data)){
+		if (!is_string($data)) {
 			throw new OAuthStorageException('invalid data');
 		}
 

src/Core/OAuth2Interface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use Psr\Http\Message\UriInterface;
 
-interface OAuth2Interface extends OAuthInterface{
+interface OAuth2Interface extends OAuthInterface {
 
 	const AUTH_METHOD_HEADER = 1;
 	const AUTH_METHOD_QUERY  = 2;

src/OAuthOptions.php

Spacing +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
  * @property int        $retries
  * @property array      $curl_multi_options
  */
-class OAuthOptions extends SettingsContainerAbstract{
+class OAuthOptions extends SettingsContainerAbstract {
 	use OAuthOptionsTrait, HTTPOptionsTrait;
 }

src/Core/OAuth2Provider.php

Spacing +23 added lines, -23 removed lines

@@ -23,7 +23,7 @@ 
 
 use const PHP_QUERY_RFC1738;
 
-abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
+abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface {
 
 	/**
 	 *
@@ -61,7 +61,7 @@ 
 	public function getAuthURL(array $params = null, array $scopes = null):UriInterface{
 		$params ??= [];
 
-		if(isset($params['client_secret'])){
+		if (isset($params['client_secret'])) {
 			unset($params['client_secret']);
 		}
 
@@ -72,11 +72,11 @@ 
 			'type'          => 'web_server',
 		]);
 
-		if(!empty($scopes)){
+		if (!empty($scopes)) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -92,19 +92,19 @@ 
 	protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 		$data = json_decode(decompress_content($response), true); // silly amazon...
 
-		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');
 		}
 
@@ -127,7 +127,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):AccessToken{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -145,7 +145,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 			->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->withHeader($header, $value);
 		}
 
@@ -161,11 +161,11 @@ 
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
 
-		if($this->authMethod === OAuth2Interface::AUTH_METHOD_HEADER){
+		if ($this->authMethod === OAuth2Interface::AUTH_METHOD_HEADER) {
 			return $request->withHeader('Authorization', $this->authMethodHeader.' '.$token->accessToken);
 		}
 
-		if($this->authMethod === OAuth2Interface::AUTH_METHOD_QUERY){
+		if ($this->authMethod === OAuth2Interface::AUTH_METHOD_QUERY) {
 			$uri = merge_query($request->getUri()->__toString(), [$this->authMethodQuery => $token->accessToken]);
 
 			return $request->withUri($this->uriFactory->createUri($uri));
@@ -180,13 +180,13 @@ 
 	 */
 	public function getClientCredentialsToken(array $scopes = null):AccessToken{
 
-		if(!$this instanceof ClientCredentials){
+		if (!$this instanceof ClientCredentials) {
 			throw new ProviderException('client credentials token not supported');
 		}
 
 		$params = ['grant_type' => 'client_credentials'];
 
-		if($scopes !== null){
+		if ($scopes !== null) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
@@ -198,7 +198,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);
 		}
 
@@ -215,17 +215,17 @@ 
 	 */
 	public function refreshAccessToken(AccessToken $token = null):AccessToken{
 
-		if(!$this instanceof TokenRefresh){
+		if (!$this instanceof TokenRefresh) {
 			throw new ProviderException('token refresh not supported');
 		}
 
-		if($token === null){
+		if ($token === null) {
 			$token = $this->storage->getAccessToken($this->serviceName);
 		}
 
 		$refreshToken = $token->refreshToken;
 
-		if(empty($refreshToken)){
+		if (empty($refreshToken)) {
 			throw new ProviderException(
 				sprintf('no refresh token available, token expired [%s]', date('Y-m-d h:i:s A', $token->expires))
 			);
@@ -246,13 +246,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;
 		}
 
@@ -269,13 +269,13 @@ 
 	 */
 	protected function checkState(string $state = null):void{
 
-		if(empty($state) || !$this->storage->hasCSRFState($this->serviceName)){
+		if (empty($state) || !$this->storage->hasCSRFState($this->serviceName)) {
 			throw new ProviderException('invalid state for '.$this->serviceName);
 		}
 
 		$knownState = $this->storage->getCSRFState($this->serviceName);
 
-		if(!hash_equals($knownState, $state)){
+		if (!hash_equals($knownState, $state)) {
 			throw new ProviderException('invalid CSRF state: '.$this->serviceName.' '.$state);
 		}
 
@@ -288,7 +288,7 @@ 
 	 */
 	protected function setState(array $params):array{
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}
 

src/Core/AccessToken.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
  * @property int    $expires
  * @property string $provider
  */
-class AccessToken extends SettingsContainerAbstract{
+class AccessToken extends SettingsContainerAbstract {
 
 	/**
 	 * Denotes an unknown end of life time.
@@ -80,7 +80,7 @@ 
 	 *
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 		parent::__construct($properties);
 
 		$this->setExpiry($this->expires);
@@ -103,16 +103,16 @@ 
 	public function setExpiry(int $expires = null):AccessToken{
 		$now = time();
 
-		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;
 		}
-		else{
+		else {
 			$this->expires = $this::EOL_UNKNOWN;
 		}
 

Braces +3 added lines, -6 removed lines

@@ -105,14 +105,11 @@
 
 		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;
-		}
-		else{
+		} else{
 			$this->expires = $this::EOL_UNKNOWN;
 		}
 

src/Storage/MemoryStorage.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use function array_keys, array_key_exists;
 
-class MemoryStorage extends OAuthStorageAbstract{
+class MemoryStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the token storage array
@@ -40,7 +40,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -59,7 +59,7 @@ 
 	 */
 	public function clearAccessToken(string $service):bool{
 
-		if(array_key_exists($service, $this->tokens)){
+		if (array_key_exists($service, $this->tokens)) {
 			unset($this->tokens[$service]);
 		}
 
@@ -71,7 +71,7 @@ 
 	 */
 	public function clearAllAccessTokens():bool{
 
-		foreach(array_keys($this->tokens) as $service){
+		foreach (array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]);
 		}
 
@@ -94,7 +94,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$service];
 		}
 
@@ -113,7 +113,7 @@ 
 	 */
 	public function clearCSRFState(string $service):bool{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

src/Storage/SessionStorage.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
 
 use const PHP_SESSION_NONE;
 
-class SessionStorage extends OAuthStorageAbstract{
+class SessionStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the key name for the token storage array in $_SESSION
@@ -34,7 +34,7 @@ 
 	 *
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->tokenVar = $this->options->sessionTokenVar;
@@ -42,15 +42,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->tokenVar])){
+		if (!isset($_SESSION[$this->tokenVar])) {
 			$_SESSION[$this->tokenVar] = [];
 		}
 
-		if(!isset($_SESSION[$this->stateVar])){
+		if (!isset($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar] = [];
 		}
 
@@ -61,8 +61,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -81,7 +81,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->fromStorage($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -100,7 +100,7 @@ 
 	 */
 	public function clearAccessToken(string $service):bool{
 
-		if(array_key_exists($service, $_SESSION[$this->tokenVar])){
+		if (array_key_exists($service, $_SESSION[$this->tokenVar])) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -112,7 +112,7 @@ 
 	 */
 	public function clearAllAccessTokens():bool{
 
-		foreach(array_keys($_SESSION[$this->tokenVar]) as $service){
+		foreach (array_keys($_SESSION[$this->tokenVar]) as $service) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -135,7 +135,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -154,7 +154,7 @@ 
 	 */
 	public function clearCSRFState(string $service):bool{
 
-		if(array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}