chillerlan / php-oauth-core

src/OAuthException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace chillerlan\OAuth;
 
-class OAuthException extends \Exception{}
+class OAuthException extends \Exception {}

src/Core/ProviderException.php

Spacing +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
 
 use chillerlan\OAuth\OAuthException;
 
-class ProviderException extends OAuthException{}
+class ProviderException extends OAuthException {}

src/Core/AccessToken.php

Braces +2 added lines, -4 removed lines

@@ -138,11 +138,9 @@
 
 		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;
 		}
 

Spacing +6 added lines, -6 removed lines

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

src/Storage/OAuthStorageException.php

Spacing +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
 
 use chillerlan\OAuth\OAuthException;
 
-class OAuthStorageException extends OAuthException{}
+class OAuthStorageException extends OAuthException {}

src/Core/OAuth1Provider.php

Braces +2 added lines, -4 removed lines

@@ -78,11 +78,9 @@
 
 		if(!$data || !is_array($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');
 		}
 

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
 	implode, in_array, is_array, parse_str, parse_url, random_bytes, strtoupper;
 use function chillerlan\HTTP\Psr7\{build_http_query, decompress_content, merge_query, r_rawurlencode};
 
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * @var string
@@ -65,7 +65,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -82,17 +82,17 @@ 
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
 		parse_str(decompress_content($response), $data);
 
-		if(!$data || !is_array($data)){
+		if (!$data || !is_array($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($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')){
+		if ($checkCallbackConfirmed && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -138,7 +138,7 @@ 
 	protected function getSignature(string $url, array $params, string $method, string $accessTokenSecret = null):string{
 		$parseURL = parse_url($url);
 
-		if(!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)){
+		if (!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)) {
 			throw new ProviderException('getSignature: invalid url');
 		}
 
@@ -146,7 +146,7 @@ 
 
 		$signatureParams = array_merge($query, $params);
 
-		if(isset($signatureParams['oauth_signature'])){
+		if (isset($signatureParams['oauth_signature'])) {
 			unset($signatureParams['oauth_signature']);
 		}
 
@@ -204,7 +204,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

@@ -14,7 +14,7 @@
 
 use Psr\Http\Message\UriInterface;
 
-interface OAuth2Interface extends OAuthInterface{
+interface OAuth2Interface extends OAuthInterface {
 
 	const HEADER_OAUTH              = 0;
 	const HEADER_BEARER             = 1;

src/OAuthOptions.php

Spacing +1 added lines, -1 removed lines

@@ -36,6 +36,6 @@
  * @property bool       $ssl_verifypeer
  * @property string     $curlHandle
  */
-class OAuthOptions extends SettingsContainerAbstract{
+class OAuthOptions extends SettingsContainerAbstract {
 	use OAuthOptionsTrait, HTTPOptionsTrait;
 }

src/Core/OAuthProvider.php

Braces +1 added lines, -2 removed lines

@@ -296,8 +296,7 @@
 			// @todo: content type support
 			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 +20 added lines, -20 removed lines

@@ -42,7 +42,7 @@ 
  * @property string                                         $serviceName
  * @property string                                         $userRevokeURL
  */
-abstract class OAuthProvider implements OAuthInterface{
+abstract class OAuthProvider implements OAuthInterface {
 	use LoggerAwareTrait;
 
 	protected const ALLOWED_PROPERTIES = [
@@ -149,7 +149,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;
@@ -161,10 +161,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
 			}
 
@@ -177,9 +177,9 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 
-		if(in_array($name, $this::ALLOWED_PROPERTIES, true)){
+		if (in_array($name, $this::ALLOWED_PROPERTIES, true)) {
 			return $this->{$name};
 		}
 
@@ -248,11 +248,11 @@ 
 	 */
 	public function __call(string $name, array $arguments):ResponseInterface{
 
-		if(!$this instanceof ApiClientInterface || !$this->endpoints instanceof EndpointMap){
+		if (!$this instanceof ApiClientInterface || !$this->endpoints instanceof EndpointMap) {
 			throw new ApiClientException('MagicAPI not available');
 		}
 
-		if(!$this->endpoints->__isset($name)){
+		if (!$this->endpoints->__isset($name)) {
 			throw new ApiClientException('endpoint not found: "'.$name.'"');
 		}
 
@@ -265,21 +265,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 = [];
 			}
 
@@ -329,24 +329,24 @@ 
 		$request = $this->requestFactory
 			->createRequest($method ?? 'GET', 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);
 		}
 
-		if(is_array($body) && $request->hasHeader('content-type')){
+		if (is_array($body) && $request->hasHeader('content-type')) {
 			$contentType = strtolower($request->getHeaderLine('content-type'));
 
 			// @todo: content type support
-			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)
 				->withHeader('Content-length', $body->getSize())
@@ -364,11 +364,11 @@ 
 	public function sendRequest(RequestInterface $request):ResponseInterface{
 
 		// get authorization only if we request the provider API
-		if(strpos((string)$request->getUri(), $this->apiURL) === 0){
+		if (strpos((string)$request->getUri(), $this->apiURL) === 0) {
 			$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);
 			}
 

examples/oauth-example-common.php

Spacing +1 added lines, -1 removed lines

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