chillerlan / php-oauth-core

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):OAuthStorageInterface{
 
-		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():OAuthStorageInterface{
 
-		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):OAuthStorageInterface{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

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
@@ -35,7 +35,7 @@ 
 	/**
 	 * SessionStorage constructor.
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->tokenVar = $this->options->sessionTokenVar;
@@ -43,15 +43,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] = [];
 		}
 
@@ -62,8 +62,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -82,7 +82,7 @@ 
 	 */
 	public function getAccessToken(string $service):AccessToken{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->fromStorage($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -101,7 +101,7 @@ 
 	 */
 	public function clearAccessToken(string $service):OAuthStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->tokenVar])){
+		if (array_key_exists($service, $_SESSION[$this->tokenVar])) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -113,7 +113,7 @@ 
 	 */
 	public function clearAllAccessTokens():OAuthStorageInterface{
 
-		foreach(array_keys($_SESSION[$this->tokenVar]) as $service){
+		foreach (array_keys($_SESSION[$this->tokenVar]) as $service) {
 			unset($_SESSION[$this->tokenVar][$service]);
 		}
 
@@ -136,7 +136,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -155,7 +155,7 @@ 
 	 */
 	public function clearCSRFState(string $service):OAuthStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}
 

src/Core/OAuth2Provider.php

Spacing +24 added lines, -24 removed lines

@@ -26,7 +26,7 @@ 
  * Implements an abstract OAuth2 provider with all methods required by the OAuth2Interface.
  * It also implements the ClientCredentials, CSRFToken and TokenRefresh interfaces in favor over traits.
  */
-abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
+abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface {
 
 	/**
 	 * Specifies the authentication method:
@@ -83,11 +83,11 @@ 
 			'type'          => 'web_server',
 		]);
 
-		if(!empty($scopes)){
+		if (!empty($scopes)) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -106,19 +106,19 @@ 
 		// silly amazon sends compressed data...
 		$data = json_decode(MessageUtil::decompress($response), true, 512, JSON_THROW_ON_ERROR);
 
-		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');
 		}
 
@@ -140,7 +140,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):AccessToken{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -158,7 +158,7 @@ 
 			->withHeader('Accept-Encoding', 'identity')
 			->withBody($this->streamFactory->createStream($this->buildQuery($body, PHP_QUERY_RFC1738)));
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withHeader($header, $value);
 		}
 
@@ -174,11 +174,11 @@ 
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
 
-		if($this->authMethod === OAuth2Interface::AUTH_METHOD_HEADER){
+		if ($this->authMethod === OAuth2Interface::AUTH_METHOD_HEADER) {
 			return $request->withHeader('Authorization', $this->authMethodHeader.' '.$token->accessToken);
 		}
 
-		if($this->authMethod === OAuth2Interface::AUTH_METHOD_QUERY){
+		if ($this->authMethod === OAuth2Interface::AUTH_METHOD_QUERY) {
 			$uri = $this->mergeQuery((string)$request->getUri(), [$this->authMethodQuery => $token->accessToken]);
 
 			return $request->withUri($this->uriFactory->createUri($uri));
@@ -196,13 +196,13 @@ 
 	 */
 	public function getClientCredentialsToken(array $scopes = null):AccessToken{
 
-		if(!$this instanceof ClientCredentials){
+		if (!$this instanceof ClientCredentials) {
 			throw new ProviderException('client credentials token not supported');
 		}
 
 		$params = ['grant_type' => 'client_credentials'];
 
-		if($scopes !== null){
+		if ($scopes !== null) {
 			$params['scope'] = implode($this->scopesDelimiter, $scopes);
 		}
 
@@ -214,7 +214,7 @@ 
 			->withBody($this->streamFactory->createStream($this->buildQuery($params, PHP_QUERY_RFC1738)))
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
@@ -234,17 +234,17 @@ 
 	 */
 	public function refreshAccessToken(AccessToken $token = null):AccessToken{
 
-		if(!$this instanceof TokenRefresh){
+		if (!$this instanceof TokenRefresh) {
 			throw new ProviderException('token refresh not supported');
 		}
 
-		if($token === null){
+		if ($token === null) {
 			$token = $this->storage->getAccessToken($this->serviceName);
 		}
 
 		$refreshToken = $token->refreshToken;
 
-		if(empty($refreshToken)){
+		if (empty($refreshToken)) {
 			throw new ProviderException(
 				sprintf('no refresh token available, token expired [%s]', date('Y-m-d h:i:s A', $token->expires))
 			);
@@ -265,13 +265,13 @@ 
 			->withBody($this->streamFactory->createStream($this->buildQuery($body, PHP_QUERY_RFC1738)))
 		;
 
-		foreach($this->authHeaders as $header => $value){
+		foreach ($this->authHeaders as $header => $value) {
 			$request = $request->withAddedHeader($header, $value);
 		}
 
 		$newToken = $this->parseTokenResponse($this->http->sendRequest($request));
 
-		if(empty($newToken->refreshToken)){
+		if (empty($newToken->refreshToken)) {
 			$newToken->refreshToken = $refreshToken;
 		}
 
@@ -291,17 +291,17 @@ 
 	 */
 	public function checkState(string $state = null):void{
 
-		if(!$this instanceof CSRFToken){
+		if (!$this instanceof CSRFToken) {
 			throw new ProviderException('CSRF protection not supported');
 		}
 
-		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);
 		}
 
@@ -318,11 +318,11 @@ 
 	 */
 	public function setState(array $params):array{
 
-		if(!$this instanceof CSRFToken){
+		if (!$this instanceof CSRFToken) {
 			throw new ProviderException('CSRF protection not supported');
 		}
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}