chillerlan / php-oauth-core

src/OAuthException.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 use Exception;
 
-class OAuthException extends Exception{
+class OAuthException extends Exception {
 
 }

src/Core/OAuthProvider.php

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
  * Implements an abstract OAuth provider with all methods required by the OAuthInterface.
  * It also implements a magic getter that allows to access the properties listed below.
  */
-abstract class OAuthProvider implements OAuthInterface{
+abstract class OAuthProvider implements OAuthInterface {
 
 	protected const ALLOWED_PROPERTIES = [
 		'apiDocs', 'apiURL', 'applicationURL', 'serviceName', 'userRevokeURL',
@@ -141,7 +141,7 @@ 
 		ClientInterface $http,
 		OAuthOptions|SettingsContainerInterface $options,
 		LoggerInterface $logger = null
-	){
+	) {
 		$this->http           = $http;
 		$this->options        = $options;
 		$this->logger         = ($logger ?? new NullLogger);
@@ -162,7 +162,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};
 		}
 
@@ -257,11 +257,11 @@ 
 	):ResponseInterface{
 		$request = $this->requestFactory->createRequest(($method ?? 'GET'), $this->getRequestURL($path, $params));
 
-		foreach($this->getRequestHeaders($headers) as $header => $value){
+		foreach ($this->getRequestHeaders($headers) as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
-		if($body !== null){
+		if ($body !== null) {
 			$body    = $this->getRequestBody($body, $request);
 			$request = $request
 				->withBody($body)
@@ -300,30 +300,30 @@ 
 	 */
 	protected function getRequestBody(StreamInterface|array|string $body, RequestInterface $request):StreamInterface{
 
-		if($body instanceof StreamInterface){
+		if ($body instanceof StreamInterface) {
 			return $body; // @codeCoverageIgnore
 		}
 
-		if(is_string($body)){
+		if (is_string($body)) {
 			// we don't check if the given string matches the content type - this is the implementor's responsibility
 			return $this->streamFactory->createStream($body);
 		}
 
-		if(is_array($body)){
+		if (is_array($body)) {
 			$body        = $this->cleanBodyParams($body);
 			$contentType = strtolower($request->getHeaderLine('content-type'));
 
-			if($contentType === 'application/x-www-form-urlencoded'){
+			if ($contentType === 'application/x-www-form-urlencoded') {
 				return $this->streamFactory->createStream(QueryUtil::build($body, PHP_QUERY_RFC1738));
 			}
 
-			if(in_array($contentType, ['application/json', 'application/vnd.api+json'])){
+			if (in_array($contentType, ['application/json', 'application/vnd.api+json'])) {
 				return $this->streamFactory->createStream(json_encode($body));
 			}
 
 		}
 
-		throw new ProviderException('invalid body/content-type');  // @codeCoverageIgnore
+		throw new ProviderException('invalid body/content-type'); // @codeCoverageIgnore
 	}
 
 	/**
@@ -345,18 +345,18 @@ 
 	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){
-				throw new ProviderException(sprintf('given host (%s) does not match provider (%s)', $parsedURL['host'] , $host));
+			if ($parsedURL['host'] !== $host) {
+				throw new ProviderException(sprintf('given host (%s) does not match provider (%s)', $parsedURL['host'], $host));
 			}
 
 			// we explicitly ignore any existing parameters here
@@ -373,15 +373,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);
 			}
 

src/Core/ProviderException.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 use chillerlan\OAuth\OAuthException;
 
-class ProviderException extends OAuthException{
+class ProviderException extends OAuthException {
 
 }

src/Core/AccessToken.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
  * @property int    $expires
  * @property string $provider
  */
-final class AccessToken extends SettingsContainerAbstract{
+final class AccessToken extends SettingsContainerAbstract {
 
 	/**
 	 * Denotes an unknown end of lifetime.
@@ -91,7 +91,7 @@ 
 	 *
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 		parent::__construct($properties);
 
 		$this->setExpiry($this->expires);
@@ -114,16 +114,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

@@ -116,14 +116,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/Core/OAuth1Provider.php

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 /**
  * Implements an abstract OAuth1 provider with all methods required by the OAuth1Interface.
  */
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * The request OAuth1 token URL
@@ -67,7 +67,7 @@ 
 			->withHeader('Content-Length', '0') // tumblr requires a content-length header set
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -84,20 +84,20 @@ 
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
 		$data = QueryUtil::parse(MessageUtil::decompress($response));
 
-		if(empty($data)){
+		if (empty($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
-		elseif(isset($data['error'])){
+		elseif (isset($data['error'])) {
 			throw new ProviderException('error retrieving access token: '.$data['error']);
 		}
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
+		elseif (!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])) {
 			throw new ProviderException('invalid token');
 		}
 
-		if(
+		if (
 			$checkCallbackConfirmed
 			&& (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')
-		){
+		) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -133,7 +133,7 @@ 
 	protected function getSignature(string $url, array $params, string $method, string $accessTokenSecret = null):string{
 		$parsed = QueryUtil::parseUrl($url);
 
-		if(!isset($parsed['host']) || !isset($parsed['scheme']) || !in_array($parsed['scheme'], ['http', 'https'], true)){
+		if (!isset($parsed['host']) || !isset($parsed['scheme']) || !in_array($parsed['scheme'], ['http', 'https'], true)) {
 			throw new ProviderException('getSignature: invalid url');
 		}
 
@@ -150,7 +150,7 @@ 
 		]);
 
 		// https://tools.ietf.org/html/rfc5849#section-3.4.2
-		$key  = array_map('rawurlencode', [
+		$key = array_map('rawurlencode', [
 			$this->options->secret,
 			($accessTokenSecret ?? ''),
 		]);
@@ -197,7 +197,7 @@ 
 			$token->accessTokenSecret
 		);
 
-		if(isset($query['oauth_session_handle'])){
+		if (isset($query['oauth_session_handle'])) {
 			$parameters['oauth_session_handle'] = $query['oauth_session_handle']; // @codeCoverageIgnore
 		}
 

src/Core/OAuth2Interface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  * Specifies the basic methods for an OAuth2 provider.
  */
-interface OAuth2Interface extends OAuthInterface{
+interface OAuth2Interface extends OAuthInterface {
 
 	public const AUTH_METHOD_HEADER = 1;
 	public const AUTH_METHOD_QUERY  = 2;

src/Storage/OAuthStorageAbstract.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 /**
  * Implements an abstract OAuth storage adapter
  */
-abstract class OAuthStorageAbstract implements OAuthStorageInterface{
+abstract class OAuthStorageAbstract implements OAuthStorageInterface {
 	use LoggerAwareTrait;
 
 	protected OAuthOptions|SettingsContainerInterface $options;
@@ -28,7 +28,7 @@ 
 	/**
 	 * OAuthStorageAbstract constructor.
 	 */
-	public function __construct(OAuthOptions|SettingsContainerInterface $options = null, LoggerInterface $logger = null){
+	public function __construct(OAuthOptions|SettingsContainerInterface $options = null, LoggerInterface $logger = null) {
 		$this->options = ($options ?? new OAuthOptions);
 		$this->logger  = ($logger ?? new NullLogger);
 	}
@@ -39,7 +39,7 @@ 
 	public function setServiceName(string $service):OAuthStorageInterface{
 		$service = trim($service);
 
-		if(empty($service)){
+		if (empty($service)) {
 			throw new OAuthStorageException('service name must not be empty');
 		}
 
@@ -53,13 +53,13 @@ 
 	 */
 	public function getServiceName(string $service = null):string{
 
-		if($service === null && !isset($this->serviceName)){
+		if ($service === null && !isset($this->serviceName)) {
 			throw new OAuthStorageException('invalid service');
 		}
 
 		$name = trim($service ?? $this->serviceName);
 
-		if(empty($name)){
+		if (empty($name)) {
 			throw new OAuthStorageException('service name must not be empty');
 		}
 
@@ -79,7 +79,7 @@ 
 	 */
 	public function fromStorage(mixed $data):AccessToken{
 
-		if(!is_string($data)){
+		if (!is_string($data)) {
 			throw new OAuthStorageException('invalid data');
 		}
 

src/Storage/OAuthStorageException.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 use chillerlan\OAuth\OAuthException;
 
-class OAuthStorageException extends OAuthException{
+class OAuthStorageException extends OAuthException {
 
 }