chillerlan / php-oauth-core

src/Core/OAuthProvider.php

Braces +2 added lines, -4 removed lines

@@ -335,12 +335,10 @@
 			if(is_array($body)){
 				if($contentType === 'application/x-www-form-urlencoded'){
 					$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
-				}
-				elseif($contentType === 'application/json' || $contentType === 'application/vnd.api+json'){
+				} elseif($contentType === 'application/json' || $contentType === '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);
 			}

Spacing +31 added lines, -31 removed lines

@@ -42,7 +42,7 @@ 
  * @property string                                          $serviceName
  * @property string|null                                     $userRevokeURL
  */
-abstract class OAuthProvider implements OAuthInterface{
+abstract class OAuthProvider implements OAuthInterface {
 	use LoggerAwareTrait;
 
 	protected const ALLOWED_PROPERTIES = [
@@ -156,7 +156,7 @@ 
 		OAuthStorageInterface $storage,
 		SettingsContainerInterface $options,
 		LoggerInterface $logger = null
-	){
+	) {
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;
@@ -168,10 +168,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
 			}
 
@@ -186,9 +186,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};
 		}
 
@@ -246,11 +246,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.'"');
 		}
 
@@ -270,25 +270,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);
 			}
 		}
@@ -309,13 +309,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)));
@@ -331,9 +331,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;
 			}
 
@@ -371,28 +371,28 @@ 
 		$request = $this->requestFactory
 			->createRequest($method ?? 'GET', Query::merge($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(http_build_query($body, '', '&', PHP_QUERY_RFC1738));
 				}
-				elseif($contentType === 'application/json' || $contentType === 'application/vnd.api+json'){
+				elseif ($contentType === 'application/json' || $contentType === '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())
@@ -414,15 +414,15 @@ 
 	protected function getRequestTarget(string $uri):string{
 		$parsedURL = parse_url($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'])) {
 
 			// back out if it doesn't match
-			if($parsedURL['host'] !== parse_url($this->apiURL, PHP_URL_HOST)){
+			if ($parsedURL['host'] !== parse_url($this->apiURL, PHP_URL_HOST)) {
 				throw new ProviderException('given host does not match provider host');
 			}
 
@@ -440,15 +440,15 @@ 
 	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(
+			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

@@ -13,7 +13,7 @@
 /**
  * The settings for the OAuth provider
  */
-trait OAuthOptionsTrait{
+trait OAuthOptionsTrait {
 
 	/**
 	 * The application key (or id) given by your provider

src/Storage/OAuthStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 /**
  * Specifies the methods required for an OAuth storage adapter
  */
-interface OAuthStorageInterface extends LoggerAwareInterface{
+interface OAuthStorageInterface extends LoggerAwareInterface {
 
 	/**
 	 * Stores an AccessToken for the given $service

src/Storage/MemoryStorage.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Implements a memory storage adapter. Memory storage is not persistent as tokens are only stored during script runtime.
  */
-class MemoryStorage extends OAuthStorageAbstract{
+class MemoryStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the token storage array
@@ -43,7 +43,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -62,7 +62,7 @@ 
 	 */
 	public function clearAccessToken(string $service):bool{
 
-		if(array_key_exists($service, $this->tokens)){
+		if (array_key_exists($service, $this->tokens)) {
 			unset($this->tokens[$service]);
 		}
 
@@ -74,7 +74,7 @@ 
 	 */
 	public function clearAllAccessTokens():bool{
 
-		foreach(array_keys($this->tokens) as $service){
+		foreach (array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]);
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$service];
 		}
 
@@ -116,7 +116,7 @@ 
 	 */
 	public function clearCSRFState(string $service):bool{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

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;
 
 	/**
@@ -33,7 +33,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->setLogger($logger ?? new NullLogger);
@@ -53,7 +53,7 @@ 
 	 */
 	public function fromStorage($data):AccessToken{
 
-		if(!is_string($data)){
+		if (!is_string($data)) {
 			throw new OAuthStorageException('invalid data');
 		}
 

src/Storage/SessionStorage.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Implements a session storage adapter. Session storage is half persistent as tokens are stored for the duration of the session.
  */
-class SessionStorage extends OAuthStorageAbstract{
+class SessionStorage extends OAuthStorageAbstract {
 
 	/**
 	 * the key name for the token storage array in $_SESSION
@@ -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->tokenVar = $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->tokenVar])){
+		if (!isset($_SESSION[$this->tokenVar])) {
 			$_SESSION[$this->tokenVar] = [];
 		}
 
-		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();
 		}
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->fromStorage($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -103,7 +103,7 @@ 
 	 */
 	public function clearAccessToken(string $service):bool{
 
-		if(array_key_exists($service, $_SESSION[$this->tokenVar])){
+		if (array_key_exists($service, $_SESSION[$this->tokenVar])) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -115,7 +115,7 @@ 
 	 */
 	public function clearAllAccessTokens():bool{
 
-		foreach(array_keys($_SESSION[$this->tokenVar]) as $service){
+		foreach (array_keys($_SESSION[$this->tokenVar]) as $service) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -138,7 +138,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -157,7 +157,7 @@ 
 	 */
 	public function clearCSRFState(string $service):bool{
 
-		if(array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}
 

src/Core/TokenRefresh.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @link https://tools.ietf.org/html/rfc6749#section-10.4
  */
-interface TokenRefresh{
+interface TokenRefresh {
 
 	/**
 	 * Tries to refresh an existing AccessToken with an associated refresh token and returns a fresh AccessToken.

src/Core/ClientCredentials.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @link https://tools.ietf.org/html/rfc6749#section-4.4
  */
-interface ClientCredentials{
+interface ClientCredentials {
 
 	/**
 	 * Obtains an OAuth2 client credentials token and returns an AccessToken

src/Core/OAuth1Interface.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 /**
  * Specifies the basic methods for an OAuth1 provider.
  */
-interface OAuth1Interface extends OAuthInterface{
+interface OAuth1Interface extends OAuthInterface {
 
 	/**
 	 * Obtains an OAuth1 request token and returns an AccessToken object for use in the authentication request.