chillerlan / php-oauth-core

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/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

@@ -16,7 +16,7 @@ 
 use DateTime;
 use Psr\Http\Message\{RequestInterface, ResponseInterface, UriInterface};
 
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * @var string
@@ -60,7 +60,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -77,17 +77,17 @@ 
 	protected function parseTokenResponse(ResponseInterface $response, bool $checkCallbackConfirmed = null):AccessToken{
 		parse_str(Psr7\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');
 		}
 
@@ -131,7 +131,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');
 		}
 
@@ -139,7 +139,7 @@ 
 
 		$signatureParams = array_merge($query, $params);
 
-		if(isset($signatureParams['oauth_signature'])){
+		if (isset($signatureParams['oauth_signature'])) {
 			unset($signatureParams['oauth_signature']);
 		}
 
@@ -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'];
 		}
 

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