chillerlan / php-oauth-core

src/Core/OAuth2CSRFTokenTrait.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
  * @property string                                          $serviceName
  * @property \chillerlan\OAuth\Storage\OAuthStorageInterface $storage
  */
-trait OAuth2CSRFTokenTrait{
+trait OAuth2CSRFTokenTrait {
 
 	/**
 	 * @param string|null $state
@@ -28,13 +28,13 @@ 
 	 */
 	protected function checkState(string $state = null):OAuth2Interface{
 
-		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);
 		}
 
@@ -49,7 +49,7 @@ 
 	 */
 	protected function setState(array $params):array{
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}
 

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

Spacing +17 added lines, -17 removed lines

@@ -120,7 +120,7 @@ 
 	 *
 	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
 	 */
-	public function __construct(HTTPClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options){
+	public function __construct(HTTPClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options) {
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;
@@ -132,10 +132,10 @@ 
 
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
-		if(!empty($this->endpointMap) && class_exists($this->endpointMap)){
+		if (!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');
 			}
 
@@ -148,9 +148,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 
-		if(!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL'], true)){
+		if (!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL'], true)) {
 			return null;
 		}
 
@@ -203,7 +203,7 @@ 
 	 */
 	public function __call(string $name, array $arguments):ResponseInterface{
 
-		if(!$this->endpoints instanceof EndpointMapInterface || !$this->endpoints->__isset($name)){
+		if (!$this->endpoints instanceof EndpointMapInterface || !$this->endpoints->__isset($name)) {
 			throw new ApiClientException('endpoint not found');
 		}
 
@@ -216,21 +216,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 = [];
 			}
 
@@ -259,32 +259,32 @@ 
 		$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);
 		}
 
 		$request = $this->requestFactory
 			->createRequest($method ?? 'GET', Psr7\merge_query($this->apiURL.$path, $params));
 
-		foreach(array_merge($this->apiHeaders, $headers) as $header => $value){
+		foreach (array_merge($this->apiHeaders, $headers) as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
 		$request = $this->getRequestAuthorization($request, $token);
 
-		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));
 			}
 
 		}
 
-		if($body instanceof StreamInterface){
+		if ($body instanceof StreamInterface) {
 			$request = $request->withBody($body);
 		}
 

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

src/OAuthOptions.php

Spacing +1 added lines, -1 removed lines

@@ -36,6 +36,6 @@
  * @property string     $ca_info
  * @property int        $max_redirects
  */
-class OAuthOptions extends SettingsContainerAbstract{
+class OAuthOptions extends SettingsContainerAbstract {
 	use OAuthOptionsTrait, HTTPOptionsTrait;
 }

src/Storage/OAuthStorageAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,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->logger  = $logger ?? new NullLogger;
 	}

src/OAuthOptionsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\OAuth;
 
-trait OAuthOptionsTrait{
+trait OAuthOptionsTrait {
 
 	/**
 	 * @var string