chillerlan / php-oauth-core

src/Core/OAuthProvider.php

Spacing +30 added lines, -30 removed lines

@@ -41,7 +41,7 @@ 
  * @property string                                          $serviceName
  * @property string|null                                     $userRevokeURL
  */
-abstract class OAuthProvider implements OAuthInterface{
+abstract class OAuthProvider implements OAuthInterface {
 	use LoggerAwareTrait;
 
 	protected const ALLOWED_PROPERTIES = [
@@ -150,7 +150,7 @@ 
 		OAuthStorageInterface $storage,
 		SettingsContainerInterface $options,
 		LoggerInterface $logger = null
-	){
+	) {
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;
@@ -164,10 +164,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'); // @codeCoverageIgnore
 			}
 
@@ -182,7 +182,7 @@ 
 	 */
 	public function __get(string $name):mixed{
 
-		if(in_array($name, $this::ALLOWED_PROPERTIES, true)){
+		if (in_array($name, $this::ALLOWED_PROPERTIES, true)) {
 			return $this->{$name};
 		}
 
@@ -251,11 +251,11 @@ 
 	 */
 	public function __call(string $endpointName, array $arguments):ResponseInterface{
 
-		if(!$this->endpoints instanceof EndpointMap){
+		if (!$this->endpoints instanceof EndpointMap) {
 			throw new ApiClientException('MagicAPI not available'); // @codeCoverageIgnore
 		}
 
-		if(!isset($this->endpoints->{$endpointName})){
+		if (!isset($this->endpoints->{$endpointName})) {
 			throw new ApiClientException('endpoint not found: "'.$endpointName.'"');
 		}
 
@@ -275,25 +275,25 @@ 
 		$path_element_count = count($path_elements);
 		$query_param_count  = count($query_params);
 
-		if($path_element_count > 0){
+		if ($path_element_count > 0) {
 			$path = $this->parsePathElements($path, $path_elements, $path_element_count, $arguments);
 		}
 
-		if($query_param_count > 0){
+		if ($query_param_count > 0) {
 			// $params is the first argument after path segments
 			$params = $arguments[$path_element_count] ?? null;
 
-			if(is_array($params)){
+			if (is_array($params)) {
 				$params = $this->cleanQueryParams($this->removeUnlistedParams($params, $query_params));
 			}
 		}
 
-		if(in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE']) && $has_body){
+		if (in_array($method, ['POST', 'PATCH', 'PUT', 'DELETE']) && $has_body) {
 			// if no query params are present, $body is the first argument after any path segments
 			$argPos = $query_param_count > 0 ? 1 : 0;
 			$body   = $arguments[$path_element_count + $argPos] ?? null;
 
-			if(is_array($body)){
+			if (is_array($body)) {
 				$body = $this->cleanBodyParams($body);
 			}
 		}
@@ -314,13 +314,13 @@ 
 		// we don't know if all of the given arguments are path elements...
 		$urlparams = array_slice($arguments, 0, $path_element_count);
 
-		if(count($urlparams) !== $path_element_count){
+		if (count($urlparams) !== $path_element_count) {
 			throw new APIClientException('too few URL params, required: '.implode(', ', $path_elements));
 		}
 
-		foreach($urlparams as $i => $param){
+		foreach ($urlparams as $i => $param) {
 			// ...but we do know that the arguments after the path elements are usually array or null
-			if(!is_scalar($param)){
+			if (!is_scalar($param)) {
 				$msg = 'invalid path element value for "%s": %s';
 
 				throw new APIClientException(sprintf($msg, $path_elements[$i], var_export($param, true)));
@@ -336,9 +336,9 @@ 
 	protected function removeUnlistedParams(array $params, array $allowed):array{
 		$query = [];
 		// remove any params that are not listed
-		foreach($params as $key => $value){
+		foreach ($params as $key => $value) {
 
-			if(!in_array($key, $allowed, true)){
+			if (!in_array($key, $allowed, true)) {
 				continue;
 			}
 
@@ -397,28 +397,28 @@ 
 		$request = $this->requestFactory
 			->createRequest($method ?? 'GET', $this->mergeQuery($this->getRequestTarget($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);
 		}
 
-		if($request->hasHeader('content-type')){
+		if ($request->hasHeader('content-type')) {
 			$contentType = strtolower($request->getHeaderLine('content-type'));
 
-			if(is_array($body)){
-				if($contentType === 'application/x-www-form-urlencoded'){
+			if (is_array($body)) {
+				if ($contentType === 'application/x-www-form-urlencoded') {
 					$body = $this->streamFactory->createStream($this->buildQuery($body, PHP_QUERY_RFC1738));
 				}
-				elseif(in_array($contentType, ['application/json', 'application/vnd.api+json'])){
+				elseif (in_array($contentType, ['application/json', 'application/vnd.api+json'])) {
 					$body = $this->streamFactory->createStream(json_encode($body));
 				}
 			}
-			elseif(is_string($body)){
+			elseif (is_string($body)) {
 				// we don't check if the given string matches the content type - this is the implementor's responsibility
 				$body = $this->streamFactory->createStream($body);
 			}
 		}
 
-		if($body instanceof StreamInterface){
+		if ($body instanceof StreamInterface) {
 			$request = $request
 				->withBody($body)
 				->withHeader('Content-length', (string)$body->getSize())
@@ -440,17 +440,17 @@ 
 	protected function getRequestTarget(string $uri):string{
 		$parsedURL = QueryUtil::parseUrl($uri);
 
-		if(!isset($parsedURL['path'])){
+		if (!isset($parsedURL['path'])) {
 			throw new ProviderException('invalid path');
 		}
 
 		// for some reason we were given a host name
-		if(isset($parsedURL['host'])){
+		if (isset($parsedURL['host'])) {
 			$api  = QueryUtil::parseUrl($this->apiURL);
 			$host = $api['host'] ?? null;
 
 			// back out if it doesn't match
-			if($parsedURL['host'] !== $host){
+			if ($parsedURL['host'] !== $host) {
 				throw new ProviderException('given host does not match provider host');
 			}
 
@@ -468,15 +468,15 @@ 
 	public function sendRequest(RequestInterface $request):ResponseInterface{
 
 		// get authorization only if we request the provider API
-		if(str_starts_with((string)$request->getUri(), $this->apiURL)){
+		if (str_starts_with((string)$request->getUri(), $this->apiURL)) {
 			$token = $this->storage->getAccessToken($this->serviceName);
 
 			// attempt to refresh an expired token
-			if(
+			if (
 				$this instanceof TokenRefresh
 				&& $this->options->tokenAutoRefresh
 				&& ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)
-			){
+			) {
 				$token = $this->refreshAccessToken($token);
 			}
 

Braces +2 added lines, -4 removed lines

@@ -407,12 +407,10 @@
 			if(is_array($body)){
 				if($contentType === 'application/x-www-form-urlencoded'){
 					$body = $this->streamFactory->createStream($this->buildQuery($body, PHP_QUERY_RFC1738));
-				}
-				elseif(in_array($contentType, ['application/json', 'application/vnd.api+json'])){
+				} elseif(in_array($contentType, ['application/json', 'application/vnd.api+json'])){
 					$body = $this->streamFactory->createStream(json_encode($body));
 				}
-			}
-			elseif(is_string($body)){
+			} elseif(is_string($body)){
 				// we don't check if the given string matches the content type - this is the implementor's responsibility
 				$body = $this->streamFactory->createStream($body);
 			}

src/Storage/OAuthStorageAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 /**
  * Implements ab anstract OAuth storage adapter
  */
-abstract class OAuthStorageAbstract implements OAuthStorageInterface{
+abstract class OAuthStorageAbstract implements OAuthStorageInterface {
 	use LoggerAwareTrait;
 
 	/**
@@ -30,7 +30,7 @@ 
 	/**
 	 * OAuthStorageAbstract constructor.
 	 */
-	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);
@@ -51,7 +51,7 @@ 
 	 */
 	public function fromStorage(mixed $data):AccessToken{
 
-		if(!is_string($data)){
+		if (!is_string($data)) {
 			throw new OAuthStorageException('invalid data');
 		}