chillerlan / php-oauth-core

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/AccessToken.php

Spacing +8 added lines, -8 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.
@@ -83,7 +83,7 @@ 
 	 *
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 		parent::__construct($properties);
 
 		$this->setExpiry($this->expires);
@@ -99,7 +99,7 @@ 
 	 */
 	public function __set(string $property, $value):void{
 
-		if(property_exists($this, $property)){
+		if (property_exists($this, $property)) {
 			$property === 'expires'
 				? $this->setExpiry($value)
 				: $this->{$property} = $value;
@@ -115,19 +115,19 @@ 
 	public function setExpiry(int $expires = null):AccessToken{
 		$now = time();
 
-		if($expires!== null){
-			$expires =  intval($expires);
+		if ($expires !== null) {
+			$expires = intval($expires);
 		}
 
 		$this->expires = self::EOL_UNKNOWN;
 
-		if($expires === 0 || $expires === self::EOL_NEVER_EXPIRES){
+		if ($expires === 0 || $expires === self::EOL_NEVER_EXPIRES) {
 			$this->expires = self::EOL_NEVER_EXPIRES;
 		}
-		elseif($expires > $now){
+		elseif ($expires > $now) {
 			$this->expires = $expires;
 		}
-		elseif($expires > 0 && $expires < self::EXPIRY_MAX){
+		elseif ($expires > 0 && $expires < self::EXPIRY_MAX) {
 			$this->expires = $now + $expires;
 		}
 

Braces +2 added lines, -4 removed lines

@@ -123,11 +123,9 @@
 
 		if($expires === 0 || $expires === self::EOL_NEVER_EXPIRES){
 			$this->expires = self::EOL_NEVER_EXPIRES;
-		}
-		elseif($expires > $now){
+		} elseif($expires > $now){
 			$this->expires = $expires;
-		}
-		elseif($expires > 0 && $expires < self::EXPIRY_MAX){
+		} elseif($expires > 0 && $expires < self::EXPIRY_MAX){
 			$this->expires = $now + $expires;
 		}
 

src/Core/OAuth2Provider.php

Braces +2 added lines, -4 removed lines

@@ -164,13 +164,11 @@
 
 		if(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_HEADER)){
 			$request = $request->withHeader('Authorization', OAuth2Interface::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken);
-		}
-		elseif(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)){
+		} elseif(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)){
 			$uri = Psr7\merge_query((string)$request->getUri(), [OAuth2Interface::AUTH_METHODS_QUERY[$this->authMethod] => $token->accessToken]);
 
 			$request = $request->withUri($this->uriFactory->createUri($uri));
-		}
-		else{
+		} else{
 			throw new ProviderException('invalid auth type');
 		}
 

Spacing +13 added lines, -13 removed lines

@@ -20,7 +20,7 @@ 
  * @method array setState(array $params)
  * @method \chillerlan\OAuth\Core\OAuth2Interface checkState(string $state = null)
  */
-abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
+abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface {
 
 	/**
 	 * @var int
@@ -56,7 +56,7 @@ 
 	public function getAuthURL(array $params = null, array $scopes = null):UriInterface{
 		$params = $params ?? [];
 
-		if(isset($params['client_secret'])){
+		if (isset($params['client_secret'])) {
 			unset($params['client_secret']);
 		}
 
@@ -67,11 +67,11 @@ 
 			'type'          => 'web_server',
 		]);
 
-		if($scopes !== null){
+		if ($scopes !== null) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -87,19 +87,19 @@ 
 	protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 		$data = json_decode(Psr7\decompress_content($response), true); // silly amazon...
 
-		if(!is_array($data)){
+		if (!is_array($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
 
-		foreach(['error_description', 'error'] as $field){
+		foreach (['error_description', 'error'] as $field) {
 
-			if(isset($data[$field])){
+			if (isset($data[$field])) {
 				throw new ProviderException('error retrieving access token: "'.$data[$field].'"');
 			}
 
 		}
 
-		if(!isset($data['access_token'])){
+		if (!isset($data['access_token'])) {
 			throw new ProviderException('token missing');
 		}
 
@@ -125,7 +125,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):AccessToken{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -143,7 +143,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 			->withBody($this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738)));
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withHeader($header, $value);
 		}
 
@@ -163,15 +163,15 @@ 
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
 
-		if(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_HEADER)){
+		if (array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_HEADER)) {
 			$request = $request->withHeader('Authorization', OAuth2Interface::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken);
 		}
-		elseif(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)){
+		elseif (array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)) {
 			$uri = Psr7\merge_query((string)$request->getUri(), [OAuth2Interface::AUTH_METHODS_QUERY[$this->authMethod] => $token->accessToken]);
 
 			$request = $request->withUri($this->uriFactory->createUri($uri));
 		}
-		else{
+		else {
 			throw new ProviderException('invalid auth type');
 		}
 

src/Core/OAuth1Interface.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\OAuth\Core;
 
-interface OAuth1Interface extends OAuthInterface{
+interface OAuth1Interface extends OAuthInterface {
 
 	/**
 	 * @return \chillerlan\OAuth\Core\AccessToken|\chillerlan\Settings\SettingsContainerInterface

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):void{
 
-		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);
 		}
 
@@ -47,7 +47,7 @@ 
 	 */
 	protected function setState(array $params):array{
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}
 

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 +19 added lines, -19 removed lines

@@ -122,7 +122,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;
@@ -134,10 +134,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
 			}
 
@@ -150,9 +150,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function __get(string $name):?string{
+	public function __get(string $name): ?string{
 
-		if(!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)){
+		if (!in_array($name, ['serviceName', 'authURL', 'accessTokenURL', 'revokeURL', 'userRevokeURL', 'apiURL'], true)) {
 			return null;
 		}
 
@@ -209,11 +209,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');
 		}
 
@@ -226,21 +226,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 = [];
 			}
 
@@ -290,24 +290,24 @@ 
 		$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);
 		}
 
-		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())
@@ -325,11 +325,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

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