chillerlan / php-oauth-core

examples/OAuth1Testprovider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\OAuth\Core\OAuth1Provider;
 
-class OAuth1Testprovider extends OAuth1Provider{
+class OAuth1Testprovider extends OAuth1Provider {
 
 	protected $apiURL          = 'https://api.example.com';
 	protected $requestTokenURL = 'https://example.com/oauth/request_token';

examples/TestEndpoints.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\HTTP\MagicAPI\EndpointMap;
 
-class TestEndpoints extends EndpointMap{
+class TestEndpoints extends EndpointMap {
 
 	protected $test = [
 		'path'          => '/test/%1$s',

examples/OAuth2Testprovider.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	protected $authURL        = 'https://example.com/oauth2/authorize';
 	protected $accessTokenURL = 'https://example.com/oauth2/token';
 	protected $userRevokeURL  = 'https://account.example.com/apps/';
-	protected $endpointMap     = TestEndpoints::class;
+	protected $endpointMap = TestEndpoints::class;
 	protected $authHeaders    = ['foo' => 'bar'];
 	protected $apiHeaders     = ['foo' => 'bar'];
 

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

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;
 		}
 

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.
@@ -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);
@@ -108,19 +108,19 @@ 
 	public function setExpiry(int $expires = null):AccessToken{
 		$now = \time();
 
-		if($expires!== null){
+		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;
 		}
 

src/Storage/OAuthStorageAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,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);

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
 };
 

src/Core/OAuthProvider.php

Braces +1 added lines, -2 removed lines

@@ -306,8 +306,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

@@ -140,7 +140,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;
@@ -152,10 +152,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
 			}
 
@@ -168,9 +168,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};
 		}
 
@@ -227,11 +227,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.'"');
 		}
 
@@ -244,21 +244,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 = [];
 			}
 
@@ -308,24 +308,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())
@@ -343,11 +343,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);
 			}