chillerlan / php-oauth-core

src/Storage/MemoryStorage.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\OAuth\Core\AccessToken;
 
-class MemoryStorage extends OAuthStorageAbstract{
+class MemoryStorage extends OAuthStorageAbstract {
 
 	/**
 	 * @var array
@@ -46,7 +46,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -69,7 +69,7 @@ 
 	 */
 	public function clearAccessToken(string $service):OAuthStorageInterface{
 
-		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():OAuthStorageInterface{
 
-		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 getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$service];
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function clearCSRFState(string $service):OAuthStorageInterface{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$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 bool
@@ -37,7 +37,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;
@@ -45,15 +45,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] = [];
 		}
 
@@ -64,8 +64,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -79,10 +79,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];
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return (new AccessToken)->fromJSON($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -120,7 +120,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]);
 		}
 
@@ -132,7 +132,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
 		}
 
@@ -149,10 +149,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];
 		}
 
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -190,7 +190,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]);
 		}
 

examples/oauth-example-common.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 ];
 
 /** @var \chillerlan\Settings\SettingsContainerInterface $options */
-$options = new class($options_arr) extends OAuthOptions{
+$options = new class($options_arr) extends OAuthOptions {
 	use LogOptionsTrait;
 
 	protected $sleep;

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/Core/OAuthProvider.php

Braces +1 added lines, -2 removed lines

@@ -277,8 +277,7 @@
 
 			if($contentType === 'application/x-www-form-urlencoded'){
 				$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
-			}
-			elseif($contentType === 'application/json'){
+			} elseif($contentType === 'application/json'){
 				$body = $this->streamFactory->createStream(json_encode($body));
 			}
 

Spacing +19 added lines, -19 removed lines

@@ -122,7 +122,7 @@ 
 	 *
 	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
 	 */
-	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options, LoggerInterface $logger = null){
+	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options, LoggerInterface $logger = null) {
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;
@@ -134,10 +134,10 @@ 
 
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
-		if($this instanceof ApiClientInterface && !empty($this->endpointMap) && class_exists($this->endpointMap)){
+		if ($this instanceof ApiClientInterface && !empty($this->endpointMap) && class_exists($this->endpointMap)) {
 			$this->endpoints = new $this->endpointMap;
 
-			if(!$this->endpoints instanceof EndpointMapInterface){
+			if (!$this->endpoints instanceof EndpointMapInterface) {
 				throw new ApiClientException('invalid endpoint map'); // @codeCoverageIgnore
 			}
 
@@ -150,9 +150,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function __get(string $name):?string{
+	public function __get(string $name): ?string{
 
-		if(!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)){
+		if (!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)) {
 			return null;
 		}
 
@@ -209,11 +209,11 @@ 
 	 */
 	public function __call(string $name, array $arguments):ResponseInterface{
 
-		if(!$this instanceof ApiClientInterface){
+		if (!$this instanceof ApiClientInterface) {
 			throw new ApiClientException('MagicAPI not available');
 		}
 
-		if(!$this->endpoints->__isset($name)){
+		if (!$this->endpoints->__isset($name)) {
 			throw new ApiClientException('endpoint not found');
 		}
 
@@ -226,21 +226,21 @@ 
 		$path_elements = $m['path_elements'] ?? [];
 		$params_in_url = count($path_elements);
 		$params        = $arguments[$params_in_url] ?? [];
-		$urlparams     = array_slice($arguments,0 , $params_in_url);
+		$urlparams     = array_slice($arguments, 0, $params_in_url);
 
-		if($params_in_url > 0){
+		if ($params_in_url > 0) {
 
-			if(count($urlparams) < $params_in_url){
+			if (count($urlparams) < $params_in_url) {
 				throw new APIClientException('too few URL params, required: '.implode(', ', $path_elements));
 			}
 
 			$endpoint = sprintf($endpoint, ...$urlparams);
 		}
 
-		if(in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE'])){
+		if (in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE'])) {
 			$body = $arguments[$params_in_url + 1] ?? $params;
 
-			if($params === $body){
+			if ($params === $body) {
 				$params = [];
 			}
 
@@ -290,23 +290,23 @@ 
 		$request = $this->requestFactory
 			->createRequest($method ?? 'GET', Psr7\merge_query($this->apiURL.$path, $params ?? []));
 
-		if(is_array($body) && $request->hasHeader('content-type')){
+		if (is_array($body) && $request->hasHeader('content-type')) {
 			$contentType = strtolower($request->getHeaderLine('content-type'));
 
-			if($contentType === 'application/x-www-form-urlencoded'){
+			if ($contentType === 'application/x-www-form-urlencoded') {
 				$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
 			}
-			elseif($contentType === 'application/json'){
+			elseif ($contentType === 'application/json') {
 				$body = $this->streamFactory->createStream(json_encode($body));
 			}
 
 		}
 
-		foreach(array_merge($this->apiHeaders, $headers ?? []) as $header => $value){
+		foreach (array_merge($this->apiHeaders, $headers ?? []) as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
-		if($body instanceof StreamInterface){
+		if ($body instanceof StreamInterface) {
 			$request = $request->withBody($body);
 		}
 
@@ -321,11 +321,11 @@ 
 	public function sendRequest(RequestInterface $request):ResponseInterface{
 
 		// get authorization only if we request the provider API
-		if($request->getUri()->getHost() === parse_url($this->apiURL, PHP_URL_HOST)){
+		if ($request->getUri()->getHost() === parse_url($this->apiURL, PHP_URL_HOST)) {
 			$token = $this->storage->getAccessToken($this->serviceName);
 
 			// attempt to refresh an expired token
-			if($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
+			if ($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)) {
 				$token = $this->refreshAccessToken($token);
 			}
 

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