hybridauth / hybridauth

src/Provider/Slack.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('ok') || !$data->get('ok')) {
+        if ( ! $data->exists('ok') || ! $data->get('ok')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -87,14 +87,14 @@ 
         $maxSize = 0;
         foreach ($data->filter('user')->properties() as $property) {
             if (preg_match('/^image_(\d+)$/', $property, $matches) === 1) {
-                $availableSize = (int)$matches[1];
+                $availableSize = (int) $matches[1];
                 if ($maxSize < $availableSize) {
                     $maxSize = $availableSize;
                 }
             }
         }
         if ($maxSize > 0) {
-            return $data->filter('user')->get('image_' . $maxSize);
+            return $data->filter('user')->get('image_'.$maxSize);
         }
         return null;
     }

Indentation +69 added lines, -69 removed lines

@@ -17,84 +17,84 @@
  */
 class Slack extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'identity.basic identity.email identity.avatar';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'identity.basic identity.email identity.avatar';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://slack.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://slack.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://slack.com/oauth/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://slack.com/oauth/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://slack.com/api/oauth.access';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://slack.com/api/oauth.access';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://api.slack.com/docs/sign-in-with-slack';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://api.slack.com/docs/sign-in-with-slack';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('api/users.identity');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('api/users.identity');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('ok') || !$data->get('ok')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('ok') || !$data->get('ok')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $data->filter('user')->get('id');
-        $userProfile->displayName = $data->filter('user')->get('name');
-        $userProfile->email = $data->filter('user')->get('email');
-        $userProfile->photoURL = $this->findLargestImage($data);
+		$userProfile->identifier = $data->filter('user')->get('id');
+		$userProfile->displayName = $data->filter('user')->get('name');
+		$userProfile->email = $data->filter('user')->get('email');
+		$userProfile->photoURL = $this->findLargestImage($data);
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 
-    /**
-     * Returns the url of the image with the highest resolution in the user
-     * object.
-     *
-     * Slack sends multiple image urls with different resolutions. As they make
-     * no guarantees which resolutions will be included we have to search all
-     * <code>image_*</code> properties for the one with the highest resolution.
-     * The resolution is attached to the property name such as
-     * <code>image_32</code> or <code>image_192</code>.
-     *
-     * @param Data\Collection $data response object as returned by
-     *     <code>api/users.identity</code>
-     *
-     * @return string|null the value of the <code>image_*</code> property with
-     *     the highest resolution.
-     */
-    private function findLargestImage(Data\Collection $data)
-    {
-        $maxSize = 0;
-        foreach ($data->filter('user')->properties() as $property) {
-            if (preg_match('/^image_(\d+)$/', $property, $matches) === 1) {
-                $availableSize = (int)$matches[1];
-                if ($maxSize < $availableSize) {
-                    $maxSize = $availableSize;
-                }
-            }
-        }
-        if ($maxSize > 0) {
-            return $data->filter('user')->get('image_' . $maxSize);
-        }
-        return null;
-    }
+	/**
+	 * Returns the url of the image with the highest resolution in the user
+	 * object.
+	 *
+	 * Slack sends multiple image urls with different resolutions. As they make
+	 * no guarantees which resolutions will be included we have to search all
+	 * <code>image_*</code> properties for the one with the highest resolution.
+	 * The resolution is attached to the property name such as
+	 * <code>image_32</code> or <code>image_192</code>.
+	 *
+	 * @param Data\Collection $data response object as returned by
+	 *     <code>api/users.identity</code>
+	 *
+	 * @return string|null the value of the <code>image_*</code> property with
+	 *     the highest resolution.
+	 */
+	private function findLargestImage(Data\Collection $data)
+	{
+		$maxSize = 0;
+		foreach ($data->filter('user')->properties() as $property) {
+			if (preg_match('/^image_(\d+)$/', $property, $matches) === 1) {
+				$availableSize = (int)$matches[1];
+				if ($maxSize < $availableSize) {
+					$maxSize = $availableSize;
+				}
+			}
+		}
+		if ($maxSize > 0) {
+			return $data->filter('user')->get('image_' . $maxSize);
+		}
+		return null;
+	}
 }

src/Provider/Discord.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -87,7 +87,7 @@ 
 
         if ($data->get('avatar')) {
             $userProfile->photoURL = 'https://cdn.discordapp.com/avatars/';
-            $userProfile->photoURL .= $data->get('id') . '/' . $data->get('avatar') . '.png';
+            $userProfile->photoURL .= $data->get('id').'/'.$data->get('avatar').'.png';
         }
 
         return $userProfile;

Indentation +76 added lines, -76 removed lines

@@ -17,80 +17,80 @@
  */
 class Discord extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'identify email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://discordapp.com/api/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://discordapp.com/api/oauth2/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://discordapp.com/api/oauth2/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://discordapp.com/developers/docs/topics/oauth2';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('users/@me');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        // Makes display name more unique.
-        $displayName = $data->get('username') ?: $data->get('login');
-        if ($discriminator = $data->get('discriminator')) {
-            $displayName .= "#{$discriminator}";
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $displayName;
-        $userProfile->email = $data->get('email');
-
-        if ($data->get('verified')) {
-            $userProfile->emailVerified = $data->get('email');
-        }
-
-        if ($data->get('avatar')) {
-            $userProfile->photoURL = 'https://cdn.discordapp.com/avatars/';
-            $userProfile->photoURL .= $data->get('id') . '/' . $data->get('avatar') . '.png';
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'identify email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://discordapp.com/api/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://discordapp.com/api/oauth2/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://discordapp.com/api/oauth2/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://discordapp.com/developers/docs/topics/oauth2';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('users/@me');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		// Makes display name more unique.
+		$displayName = $data->get('username') ?: $data->get('login');
+		if ($discriminator = $data->get('discriminator')) {
+			$displayName .= "#{$discriminator}";
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $displayName;
+		$userProfile->email = $data->get('email');
+
+		if ($data->get('verified')) {
+			$userProfile->emailVerified = $data->get('email');
+		}
+
+		if ($data->get('avatar')) {
+			$userProfile->photoURL = 'https://cdn.discordapp.com/avatars/';
+			$userProfile->photoURL .= $data->get('id') . '/' . $data->get('avatar') . '.png';
+		}
+
+		return $userProfile;
+	}
 }

src/Provider/Dropbox.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('account_id') || !$data->get('account_id')) {
+        if ( ! $data->exists('account_id') || ! $data->get('account_id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 

Indentation +44 added lines, -44 removed lines

@@ -17,58 +17,58 @@
  */
 class Dropbox extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'account_info.read';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'account_info.read';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.dropbox.com/2/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.dropbox.com/2/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.dropbox.com/1/oauth2/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.dropbox.com/1/oauth2/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.dropbox.com/1/oauth2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.dropbox.com/1/oauth2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://www.dropbox.com/developers/documentation/http/documentation';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://www.dropbox.com/developers/documentation/http/documentation';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('users/get_current_account', 'POST', [], [], true);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('users/get_current_account', 'POST', [], [], true);
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('account_id') || !$data->get('account_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('account_id') || !$data->get('account_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $data->get('account_id');
-        $userProfile->displayName = $data->filter('name')->get('display_name');
-        $userProfile->firstName = $data->filter('name')->get('given_name');
-        $userProfile->lastName = $data->filter('name')->get('surname');
-        $userProfile->email = $data->get('email');
-        $userProfile->photoURL = $data->get('profile_photo_url');
-        $userProfile->language = $data->get('locale');
-        $userProfile->country = $data->get('country');
-        if ($data->get('email_verified')) {
-            $userProfile->emailVerified = $data->get('email');
-        }
+		$userProfile->identifier = $data->get('account_id');
+		$userProfile->displayName = $data->filter('name')->get('display_name');
+		$userProfile->firstName = $data->filter('name')->get('given_name');
+		$userProfile->lastName = $data->filter('name')->get('surname');
+		$userProfile->email = $data->get('email');
+		$userProfile->photoURL = $data->get('profile_photo_url');
+		$userProfile->language = $data->get('locale');
+		$userProfile->country = $data->get('country');
+		if ($data->get('email_verified')) {
+			$userProfile->emailVerified = $data->get('email');
+		}
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/WeChatChina.php

Indentation +16 added lines, -16 removed lines

@@ -12,23 +12,23 @@
  */
 class WeChatChina extends WeChat
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.weixin.qq.com/sns/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.weixin.qq.com/sns/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenRefreshUrl = 'https://api.weixin.qq.com/sns/oauth2/refresh_token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenRefreshUrl = 'https://api.weixin.qq.com/sns/oauth2/refresh_token';
 
-    /**
-     * {@ịnheritdoc}
-     */
-    protected $accessTokenInfoUrl = 'https://api.weixin.qq.com/sns/auth';
+	/**
+	 * {@ịnheritdoc}
+	 */
+	protected $accessTokenInfoUrl = 'https://api.weixin.qq.com/sns/auth';
 }

src/Logger/LoggerInterface.php

Indentation +32 added lines, -32 removed lines

@@ -12,39 +12,39 @@
  */
 interface LoggerInterface
 {
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     */
-    public function info($message, array $context = array());
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function info($message, array $context = array());
 
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     */
-    public function debug($message, array $context = array());
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function debug($message, array $context = array());
 
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     */
-    public function error($message, array $context = array());
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function error($message, array $context = array());
 
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     */
-    public function log($level, $message, array $context = array());
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function log($level, $message, array $context = array());
 }

src/Logger/Logger.php

Indentation +111 added lines, -111 removed lines

@@ -15,115 +15,115 @@
  */
 class Logger implements LoggerInterface
 {
-    const NONE = 'none';  // turn logging off
-    const DEBUG = 'debug'; // debug, info and error messages
-    const INFO = 'info';  // info and error messages
-    const ERROR = 'error'; // only error messages
-
-    /**
-     * Debug level.
-     *
-     * One of Logger::NONE, Logger::DEBUG, Logger::INFO, Logger::ERROR
-     *
-     * @var string
-     */
-    protected $level;
-
-    /**
-     * Path to file writeable by the web server. Required if $this->level !== Logger::NONE.
-     *
-     * @var string
-     */
-    protected $file;
-
-    /**
-     * @param bool|string $level One of Logger::NONE, Logger::DEBUG, Logger::INFO, Logger::ERROR
-     * @param string $file File where to write messages
-     *
-     * @throws InvalidArgumentException
-     * @throws RuntimeException
-     */
-    public function __construct($level, $file)
-    {
-        $this->level = self::NONE;
-
-        if ($level && $level !== self::NONE) {
-            $this->initialize($file);
-
-            $this->level = $level === true ? Logger::DEBUG : $level;
-            $this->file = $file;
-        }
-    }
-
-    /**
-     * @param string $file
-     *
-     * @throws InvalidArgumentException
-     * @throws RuntimeException
-     */
-    protected function initialize($file)
-    {
-        if (!$file) {
-            throw new InvalidArgumentException('Log file is not specified.');
-        }
-
-        if (!file_exists($file) && !touch($file)) {
-            throw new RuntimeException(sprintf('Log file %s can not be created.', $file));
-        }
-
-        if (!is_writable($file)) {
-            throw new RuntimeException(sprintf('Log file %s is not writeable.', $file));
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function info($message, array $context = [])
-    {
-        if (!in_array($this->level, [self::DEBUG, self::INFO])) {
-            return;
-        }
-
-        $this->log(self::INFO, $message, $context);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function debug($message, array $context = [])
-    {
-        if (!in_array($this->level, [self::DEBUG])) {
-            return;
-        }
-
-        $this->log(self::DEBUG, $message, $context);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function error($message, array $context = [])
-    {
-        if (!in_array($this->level, [self::DEBUG, self::INFO, self::ERROR])) {
-            return;
-        }
-
-        $this->log(self::ERROR, $message, $context);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function log($level, $message, array $context = [])
-    {
-        $datetime = new \DateTime();
-        $datetime = $datetime->format(DATE_ATOM);
-
-        $content = sprintf('%s -- %s -- %s -- %s', $level, $_SERVER['REMOTE_ADDR'], $datetime, $message);
-        $content .= ($context ? "\n" . print_r($context, true) : '');
-        $content .= "\n";
-
-        file_put_contents($this->file, $content, FILE_APPEND);
-    }
+	const NONE = 'none';  // turn logging off
+	const DEBUG = 'debug'; // debug, info and error messages
+	const INFO = 'info';  // info and error messages
+	const ERROR = 'error'; // only error messages
+
+	/**
+	 * Debug level.
+	 *
+	 * One of Logger::NONE, Logger::DEBUG, Logger::INFO, Logger::ERROR
+	 *
+	 * @var string
+	 */
+	protected $level;
+
+	/**
+	 * Path to file writeable by the web server. Required if $this->level !== Logger::NONE.
+	 *
+	 * @var string
+	 */
+	protected $file;
+
+	/**
+	 * @param bool|string $level One of Logger::NONE, Logger::DEBUG, Logger::INFO, Logger::ERROR
+	 * @param string $file File where to write messages
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws RuntimeException
+	 */
+	public function __construct($level, $file)
+	{
+		$this->level = self::NONE;
+
+		if ($level && $level !== self::NONE) {
+			$this->initialize($file);
+
+			$this->level = $level === true ? Logger::DEBUG : $level;
+			$this->file = $file;
+		}
+	}
+
+	/**
+	 * @param string $file
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws RuntimeException
+	 */
+	protected function initialize($file)
+	{
+		if (!$file) {
+			throw new InvalidArgumentException('Log file is not specified.');
+		}
+
+		if (!file_exists($file) && !touch($file)) {
+			throw new RuntimeException(sprintf('Log file %s can not be created.', $file));
+		}
+
+		if (!is_writable($file)) {
+			throw new RuntimeException(sprintf('Log file %s is not writeable.', $file));
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function info($message, array $context = [])
+	{
+		if (!in_array($this->level, [self::DEBUG, self::INFO])) {
+			return;
+		}
+
+		$this->log(self::INFO, $message, $context);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function debug($message, array $context = [])
+	{
+		if (!in_array($this->level, [self::DEBUG])) {
+			return;
+		}
+
+		$this->log(self::DEBUG, $message, $context);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function error($message, array $context = [])
+	{
+		if (!in_array($this->level, [self::DEBUG, self::INFO, self::ERROR])) {
+			return;
+		}
+
+		$this->log(self::ERROR, $message, $context);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function log($level, $message, array $context = [])
+	{
+		$datetime = new \DateTime();
+		$datetime = $datetime->format(DATE_ATOM);
+
+		$content = sprintf('%s -- %s -- %s -- %s', $level, $_SERVER['REMOTE_ADDR'], $datetime, $message);
+		$content .= ($context ? "\n" . print_r($context, true) : '');
+		$content .= "\n";
+
+		file_put_contents($this->file, $content, FILE_APPEND);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -15,9 +15,9 @@ 
  */
 class Logger implements LoggerInterface
 {
-    const NONE = 'none';  // turn logging off
+    const NONE = 'none'; // turn logging off
     const DEBUG = 'debug'; // debug, info and error messages
-    const INFO = 'info';  // info and error messages
+    const INFO = 'info'; // info and error messages
     const ERROR = 'error'; // only error messages
 
     /**
@@ -63,15 +63,15 @@ 
      */
     protected function initialize($file)
     {
-        if (!$file) {
+        if ( ! $file) {
             throw new InvalidArgumentException('Log file is not specified.');
         }
 
-        if (!file_exists($file) && !touch($file)) {
+        if ( ! file_exists($file) && ! touch($file)) {
             throw new RuntimeException(sprintf('Log file %s can not be created.', $file));
         }
 
-        if (!is_writable($file)) {
+        if ( ! is_writable($file)) {
             throw new RuntimeException(sprintf('Log file %s is not writeable.', $file));
         }
     }
@@ -81,7 +81,7 @@ 
      */
     public function info($message, array $context = [])
     {
-        if (!in_array($this->level, [self::DEBUG, self::INFO])) {
+        if ( ! in_array($this->level, [self::DEBUG, self::INFO])) {
             return;
         }
 
@@ -93,7 +93,7 @@ 
      */
     public function debug($message, array $context = [])
     {
-        if (!in_array($this->level, [self::DEBUG])) {
+        if ( ! in_array($this->level, [self::DEBUG])) {
             return;
         }
 
@@ -105,7 +105,7 @@ 
      */
     public function error($message, array $context = [])
     {
-        if (!in_array($this->level, [self::DEBUG, self::INFO, self::ERROR])) {
+        if ( ! in_array($this->level, [self::DEBUG, self::INFO, self::ERROR])) {
             return;
         }
 
@@ -121,7 +121,7 @@ 
         $datetime = $datetime->format(DATE_ATOM);
 
         $content = sprintf('%s -- %s -- %s -- %s', $level, $_SERVER['REMOTE_ADDR'], $datetime, $message);
-        $content .= ($context ? "\n" . print_r($context, true) : '');
+        $content .= ($context ? "\n".print_r($context, true) : '');
         $content .= "\n";
 
         file_put_contents($this->file, $content, FILE_APPEND);

src/Adapter/AbstractAdapter.php

Spacing +6 added lines, -6 removed lines

@@ -300,7 +300,7 @@ 
      */
     protected function setCallback($callback)
     {
-        if (!filter_var($callback, FILTER_VALIDATE_URL)) {
+        if ( ! filter_var($callback, FILTER_VALIDATE_URL)) {
             throw new InvalidArgumentException('A valid callback url is required.');
         }
 
@@ -339,16 +339,16 @@ 
      */
     protected function validateApiResponse($error = '')
     {
-        $error .= !empty($error) ? '. ' : '';
+        $error .= ! empty($error) ? '. ' : '';
 
         if ($this->httpClient->getResponseClientError()) {
             throw new HttpClientFailureException(
-                $error . 'HTTP client error: ' . $this->httpClient->getResponseClientError() . '.'
+                $error.'HTTP client error: '.$this->httpClient->getResponseClientError().'.'
             );
         }
 
         // if validateApiResponseHttpCode is set to false, we by pass verification of http status code
-        if (!$this->validateApiResponseHttpCode) {
+        if ( ! $this->validateApiResponseHttpCode) {
             return;
         }
 
@@ -356,8 +356,8 @@ 
 
         if ($status < 200 || $status > 299) {
             throw new HttpRequestFailedException(
-                $error . 'HTTP error ' . $this->httpClient->getResponseHttpCode() .
-                '. Raw Provider API response: ' . $this->httpClient->getResponseBody() . '.'
+                $error.'HTTP error '.$this->httpClient->getResponseHttpCode().
+                '. Raw Provider API response: '.$this->httpClient->getResponseBody().'.'
             );
         }
     }

Indentation +345 added lines, -345 removed lines

@@ -24,349 +24,349 @@
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
-    use DataStoreTrait;
-
-    /**
-     * Provider ID (unique name).
-     *
-     * @var string
-     */
-    protected $providerId = '';
-
-    /**
-     * Specific Provider config.
-     *
-     * @var mixed
-     */
-    protected $config = [];
-
-    /**
-     * Extra Provider parameters.
-     *
-     * @var array
-     */
-    protected $params;
-
-    /**
-     * Callback url
-     *
-     * @var string
-     */
-    protected $callback = '';
-
-    /**
-     * Storage.
-     *
-     * @var StorageInterface
-     */
-    public $storage;
-
-    /**
-     * HttpClient.
-     *
-     * @var HttpClientInterface
-     */
-    public $httpClient;
-
-    /**
-     * Logger.
-     *
-     * @var LoggerInterface
-     */
-    public $logger;
-
-    /**
-     * Whether to validate API status codes of http responses
-     *
-     * @var bool
-     */
-    protected $validateApiResponseHttpCode = true;
-
-    /**
-     * Common adapters constructor.
-     *
-     * @param array $config
-     * @param HttpClientInterface $httpClient
-     * @param StorageInterface $storage
-     * @param LoggerInterface $logger
-     */
-    public function __construct(
-        $config = [],
-        HttpClientInterface $httpClient = null,
-        StorageInterface $storage = null,
-        LoggerInterface $logger = null
-    ) {
-        $this->providerId = (new \ReflectionClass($this))->getShortName();
-
-        $this->config = new Data\Collection($config);
-
-        $this->setHttpClient($httpClient);
-
-        $this->setStorage($storage);
-
-        $this->setLogger($logger);
-
-        $this->configure();
-
-        $this->logger->debug(sprintf('Initialize %s, config: ', get_class($this)), $config);
-
-        $this->initialize();
-    }
-
-    /**
-     * Load adapter's configuration
-     */
-    abstract protected function configure();
-
-    /**
-     * Adapter initializer
-     */
-    abstract protected function initialize();
-
-    /**
-     * {@inheritdoc}
-     */
-    abstract public function isConnected();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function maintainToken()
-    {
-        // Nothing needed for most providers
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts()
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserPages()
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserActivity($stream)
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setUserStatus($status)
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPageStatus($status, $pageId)
-    {
-        throw new NotImplementedException('Provider does not support this feature.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function disconnect()
-    {
-        $this->clearStoredData();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessToken()
-    {
-        $tokenNames = [
-            'access_token',
-            'access_token_secret',
-            'token_type',
-            'refresh_token',
-            'expires_in',
-            'expires_at',
-        ];
-
-        $tokens = [];
-
-        foreach ($tokenNames as $name) {
-            if ($this->getStoredData($name)) {
-                $tokens[$name] = $this->getStoredData($name);
-            }
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setAccessToken($tokens = [])
-    {
-        $this->clearStoredData();
-
-        foreach ($tokens as $token => $value) {
-            $this->storeData($token, $value);
-        }
-
-        // Re-initialize token parameters.
-        $this->initialize();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setHttpClient(HttpClientInterface $httpClient = null)
-    {
-        $this->httpClient = $httpClient ?: new HttpClient();
-
-        if ($this->config->exists('curl_options') && method_exists($this->httpClient, 'setCurlOptions')) {
-            $this->httpClient->setCurlOptions($this->config->get('curl_options'));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHttpClient()
-    {
-        return $this->httpClient;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setStorage(StorageInterface $storage = null)
-    {
-        $this->storage = $storage ?: new Session();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStorage()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLogger(LoggerInterface $logger = null)
-    {
-        $this->logger = $logger ?: new Logger(
-            $this->config->get('debug_mode'),
-            $this->config->get('debug_file')
-        );
-
-        if (method_exists($this->httpClient, 'setLogger')) {
-            $this->httpClient->setLogger($this->logger);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLogger()
-    {
-        return $this->logger;
-    }
-
-    /**
-     * Set Adapter's API callback url
-     *
-     * @param string $callback
-     *
-     * @throws InvalidArgumentException
-     */
-    protected function setCallback($callback)
-    {
-        if (!filter_var($callback, FILTER_VALIDATE_URL)) {
-            throw new InvalidArgumentException('A valid callback url is required.');
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Overwrite Adapter's API endpoints
-     *
-     * @param array|Data\Collection $endpoints
-     */
-    protected function setApiEndpoints($endpoints = null)
-    {
-        if (empty($endpoints)) {
-            return;
-        }
-
-        $collection = is_array($endpoints) ? new Data\Collection($endpoints) : $endpoints;
-
-        $this->apiBaseUrl = $collection->get('api_base_url') ?: $this->apiBaseUrl;
-        $this->authorizeUrl = $collection->get('authorize_url') ?: $this->authorizeUrl;
-        $this->accessTokenUrl = $collection->get('access_token_url') ?: $this->accessTokenUrl;
-    }
-
-
-    /**
-     * Validate signed API responses Http status code.
-     *
-     * Since the specifics of error responses is beyond the scope of RFC6749 and OAuth Core specifications,
-     * Hybridauth will consider any HTTP status code that is different than '200 OK' as an ERROR.
-     *
-     * @param string $error String to pre append to message thrown in exception
-     *
-     * @throws HttpClientFailureException
-     * @throws HttpRequestFailedException
-     */
-    protected function validateApiResponse($error = '')
-    {
-        $error .= !empty($error) ? '. ' : '';
-
-        if ($this->httpClient->getResponseClientError()) {
-            throw new HttpClientFailureException(
-                $error . 'HTTP client error: ' . $this->httpClient->getResponseClientError() . '.'
-            );
-        }
-
-        // if validateApiResponseHttpCode is set to false, we by pass verification of http status code
-        if (!$this->validateApiResponseHttpCode) {
-            return;
-        }
-
-        $status = $this->httpClient->getResponseHttpCode();
-
-        if ($status < 200 || $status > 299) {
-            throw new HttpRequestFailedException(
-                $error . 'HTTP error ' . $this->httpClient->getResponseHttpCode() .
-                '. Raw Provider API response: ' . $this->httpClient->getResponseBody() . '.'
-            );
-        }
-    }
+	use DataStoreTrait;
+
+	/**
+	 * Provider ID (unique name).
+	 *
+	 * @var string
+	 */
+	protected $providerId = '';
+
+	/**
+	 * Specific Provider config.
+	 *
+	 * @var mixed
+	 */
+	protected $config = [];
+
+	/**
+	 * Extra Provider parameters.
+	 *
+	 * @var array
+	 */
+	protected $params;
+
+	/**
+	 * Callback url
+	 *
+	 * @var string
+	 */
+	protected $callback = '';
+
+	/**
+	 * Storage.
+	 *
+	 * @var StorageInterface
+	 */
+	public $storage;
+
+	/**
+	 * HttpClient.
+	 *
+	 * @var HttpClientInterface
+	 */
+	public $httpClient;
+
+	/**
+	 * Logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	public $logger;
+
+	/**
+	 * Whether to validate API status codes of http responses
+	 *
+	 * @var bool
+	 */
+	protected $validateApiResponseHttpCode = true;
+
+	/**
+	 * Common adapters constructor.
+	 *
+	 * @param array $config
+	 * @param HttpClientInterface $httpClient
+	 * @param StorageInterface $storage
+	 * @param LoggerInterface $logger
+	 */
+	public function __construct(
+		$config = [],
+		HttpClientInterface $httpClient = null,
+		StorageInterface $storage = null,
+		LoggerInterface $logger = null
+	) {
+		$this->providerId = (new \ReflectionClass($this))->getShortName();
+
+		$this->config = new Data\Collection($config);
+
+		$this->setHttpClient($httpClient);
+
+		$this->setStorage($storage);
+
+		$this->setLogger($logger);
+
+		$this->configure();
+
+		$this->logger->debug(sprintf('Initialize %s, config: ', get_class($this)), $config);
+
+		$this->initialize();
+	}
+
+	/**
+	 * Load adapter's configuration
+	 */
+	abstract protected function configure();
+
+	/**
+	 * Adapter initializer
+	 */
+	abstract protected function initialize();
+
+	/**
+	 * {@inheritdoc}
+	 */
+	abstract public function isConnected();
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function maintainToken()
+	{
+		// Nothing needed for most providers
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts()
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserPages()
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserActivity($stream)
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setUserStatus($status)
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setPageStatus($status, $pageId)
+	{
+		throw new NotImplementedException('Provider does not support this feature.');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function disconnect()
+	{
+		$this->clearStoredData();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAccessToken()
+	{
+		$tokenNames = [
+			'access_token',
+			'access_token_secret',
+			'token_type',
+			'refresh_token',
+			'expires_in',
+			'expires_at',
+		];
+
+		$tokens = [];
+
+		foreach ($tokenNames as $name) {
+			if ($this->getStoredData($name)) {
+				$tokens[$name] = $this->getStoredData($name);
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setAccessToken($tokens = [])
+	{
+		$this->clearStoredData();
+
+		foreach ($tokens as $token => $value) {
+			$this->storeData($token, $value);
+		}
+
+		// Re-initialize token parameters.
+		$this->initialize();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setHttpClient(HttpClientInterface $httpClient = null)
+	{
+		$this->httpClient = $httpClient ?: new HttpClient();
+
+		if ($this->config->exists('curl_options') && method_exists($this->httpClient, 'setCurlOptions')) {
+			$this->httpClient->setCurlOptions($this->config->get('curl_options'));
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHttpClient()
+	{
+		return $this->httpClient;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setStorage(StorageInterface $storage = null)
+	{
+		$this->storage = $storage ?: new Session();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getStorage()
+	{
+		return $this->storage;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setLogger(LoggerInterface $logger = null)
+	{
+		$this->logger = $logger ?: new Logger(
+			$this->config->get('debug_mode'),
+			$this->config->get('debug_file')
+		);
+
+		if (method_exists($this->httpClient, 'setLogger')) {
+			$this->httpClient->setLogger($this->logger);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getLogger()
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * Set Adapter's API callback url
+	 *
+	 * @param string $callback
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	protected function setCallback($callback)
+	{
+		if (!filter_var($callback, FILTER_VALIDATE_URL)) {
+			throw new InvalidArgumentException('A valid callback url is required.');
+		}
+
+		$this->callback = $callback;
+	}
+
+	/**
+	 * Overwrite Adapter's API endpoints
+	 *
+	 * @param array|Data\Collection $endpoints
+	 */
+	protected function setApiEndpoints($endpoints = null)
+	{
+		if (empty($endpoints)) {
+			return;
+		}
+
+		$collection = is_array($endpoints) ? new Data\Collection($endpoints) : $endpoints;
+
+		$this->apiBaseUrl = $collection->get('api_base_url') ?: $this->apiBaseUrl;
+		$this->authorizeUrl = $collection->get('authorize_url') ?: $this->authorizeUrl;
+		$this->accessTokenUrl = $collection->get('access_token_url') ?: $this->accessTokenUrl;
+	}
+
+
+	/**
+	 * Validate signed API responses Http status code.
+	 *
+	 * Since the specifics of error responses is beyond the scope of RFC6749 and OAuth Core specifications,
+	 * Hybridauth will consider any HTTP status code that is different than '200 OK' as an ERROR.
+	 *
+	 * @param string $error String to pre append to message thrown in exception
+	 *
+	 * @throws HttpClientFailureException
+	 * @throws HttpRequestFailedException
+	 */
+	protected function validateApiResponse($error = '')
+	{
+		$error .= !empty($error) ? '. ' : '';
+
+		if ($this->httpClient->getResponseClientError()) {
+			throw new HttpClientFailureException(
+				$error . 'HTTP client error: ' . $this->httpClient->getResponseClientError() . '.'
+			);
+		}
+
+		// if validateApiResponseHttpCode is set to false, we by pass verification of http status code
+		if (!$this->validateApiResponseHttpCode) {
+			return;
+		}
+
+		$status = $this->httpClient->getResponseHttpCode();
+
+		if ($status < 200 || $status > 299) {
+			throw new HttpRequestFailedException(
+				$error . 'HTTP error ' . $this->httpClient->getResponseHttpCode() .
+				'. Raw Provider API response: ' . $this->httpClient->getResponseBody() . '.'
+			);
+		}
+	}
 }

src/Adapter/OAuth2.php

Spacing +26 added lines, -26 removed lines

@@ -249,9 +249,9 @@ 
         $this->clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
         $this->clientSecret = $this->config->filter('keys')->get('secret');
 
-        if (!$this->clientId || !$this->clientSecret) {
+        if ( ! $this->clientId || ! $this->clientSecret) {
             throw new InvalidApplicationCredentialsException(
-                'Your application id is required in order to connect to ' . $this->providerId
+                'Your application id is required in order to connect to '.$this->providerId
             );
         }
 
@@ -285,7 +285,7 @@ 
         ];
 
         $refreshToken = $this->getStoredData('refresh_token');
-        if (!empty($refreshToken)) {
+        if ( ! empty($refreshToken)) {
             $this->tokenRefreshParameters = [
                 'grant_type' => 'refresh_token',
                 'refresh_token' => $refreshToken,
@@ -293,7 +293,7 @@ 
         }
 
         $this->apiRequestHeaders = [
-            'Authorization' => 'Bearer ' . $this->getStoredData('access_token')
+            'Authorization' => 'Bearer '.$this->getStoredData('access_token')
         ];
     }
 
@@ -332,8 +332,8 @@ 
      */
     public function isConnected()
     {
-        if ((bool)$this->getStoredData('access_token')) {
-            return (!$this->hasAccessTokenExpired() || $this->isRefreshTokenAvailable());
+        if ((bool) $this->getStoredData('access_token')) {
+            return ( ! $this->hasAccessTokenExpired() || $this->isRefreshTokenAvailable());
         }
         return false;
     }
@@ -364,7 +364,7 @@ 
     {
         $error = filter_input(INPUT_GET, 'error', FILTER_SANITIZE_SPECIAL_CHARS);
 
-        if (!empty($error)) {
+        if ( ! empty($error)) {
             $error_description = filter_input(INPUT_GET, 'error_description', FILTER_SANITIZE_SPECIAL_CHARS);
             $error_uri = filter_input(INPUT_GET, 'error_uri', FILTER_SANITIZE_SPECIAL_CHARS);
 
@@ -424,7 +424,7 @@ 
             && $this->getStoredData('authorization_state') != $state
         ) {
             throw new InvalidAuthorizationStateException(
-                'The authorization state [state=' . substr(htmlentities($state), 0, 100) . '] '
+                'The authorization state [state='.substr(htmlentities($state), 0, 100).'] '
                 . 'of this page is either invalid or has already been consumed.'
             );
         }
@@ -466,23 +466,23 @@ 
      */
     protected function getAuthorizeUrl($parameters = [])
     {
-        $this->AuthorizeUrlParameters = !empty($parameters)
+        $this->AuthorizeUrlParameters = ! empty($parameters)
             ? $parameters
             : array_replace(
-                (array)$this->AuthorizeUrlParameters,
-                (array)$this->config->get('authorize_url_parameters')
+                (array) $this->AuthorizeUrlParameters,
+                (array) $this->config->get('authorize_url_parameters')
             );
 
         if ($this->supportRequestState) {
-            if (!isset($this->AuthorizeUrlParameters['state'])) {
-                $this->AuthorizeUrlParameters['state'] = 'HA-' . str_shuffle('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890');
+            if ( ! isset($this->AuthorizeUrlParameters['state'])) {
+                $this->AuthorizeUrlParameters['state'] = 'HA-'.str_shuffle('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890');
             }
 
             $this->storeData('authorization_state', $this->AuthorizeUrlParameters['state']);
         }
 
         $queryParams = http_build_query($this->AuthorizeUrlParameters, '', '&', $this->AuthorizeUrlParametersEncType);
-        return $this->authorizeUrl . '?' . $queryParams;
+        return $this->authorizeUrl.'?'.$queryParams;
     }
 
     /**
@@ -562,9 +562,9 @@ 
 
         $collection = new Data\Collection($data);
 
-        if (!$collection->exists('access_token')) {
+        if ( ! $collection->exists('access_token')) {
             throw new InvalidAccessTokenException(
-                'Provider returned no access_token: ' . htmlentities($response)
+                'Provider returned no access_token: '.htmlentities($response)
             );
         }
 
@@ -577,7 +577,7 @@ 
 
         // calculate when the access token expire
         if ($collection->exists('expires_in')) {
-            $expires_at = time() + (int)$collection->get('expires_in');
+            $expires_at = time() + (int) $collection->get('expires_in');
 
             $this->storeData('expires_in', $collection->get('expires_in'));
             $this->storeData('expires_at', $expires_at);
@@ -615,11 +615,11 @@ 
      */
     public function refreshAccessToken($parameters = [])
     {
-        $this->tokenRefreshParameters = !empty($parameters)
+        $this->tokenRefreshParameters = ! empty($parameters)
             ? $parameters
             : $this->tokenRefreshParameters;
 
-        if (!$this->isRefreshTokenAvailable()) {
+        if ( ! $this->isRefreshTokenAvailable()) {
             return null;
         }
 
@@ -650,7 +650,7 @@ 
         }
 
         $expires_at = $this->getStoredData('expires_at');
-        if (!$expires_at) {
+        if ( ! $expires_at) {
             return null;
         }
 
@@ -715,21 +715,21 @@ 
         }
 
         if (strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0) {
-            $url = rtrim($this->apiBaseUrl, '/') . '/' . ltrim($url, '/');
+            $url = rtrim($this->apiBaseUrl, '/').'/'.ltrim($url, '/');
         }
 
-        $parameters = array_replace($this->apiRequestParameters, (array)$parameters);
-        $headers = array_replace($this->apiRequestHeaders, (array)$headers);
+        $parameters = array_replace($this->apiRequestParameters, (array) $parameters);
+        $headers = array_replace($this->apiRequestHeaders, (array) $headers);
 
         $response = $this->httpClient->request(
             $url,
-            $method,     // HTTP Request Method. Defaults to GET.
+            $method, // HTTP Request Method. Defaults to GET.
             $parameters, // Request Parameters
-            $headers,    // Request Headers
+            $headers, // Request Headers
             $multipart   // Is request multipart
         );
 
-        $this->validateApiResponse('Signed API request to ' . $url . ' has returned an error');
+        $this->validateApiResponse('Signed API request to '.$url.' has returned an error');
 
         $response = (new Data\Parser())->parse($response);
 

Indentation +715 added lines, -715 removed lines

@@ -24,720 +24,720 @@
  */
 abstract class OAuth2 extends AbstractAdapter implements AdapterInterface
 {
-    /**
-     * Client Identifier
-     *
-     * RFC6749: client_id REQUIRED. The client identifier issued to the client during
-     * the registration process described by Section 2.2.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-2.2
-     *
-     * @var string
-     */
-    protected $clientId = '';
-
-    /**
-     * Client Secret
-     *
-     * RFC6749: client_secret REQUIRED. The client secret. The client MAY omit the
-     * parameter if the client secret is an empty string.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-2.2
-     *
-     * @var string
-     */
-    protected $clientSecret = '';
-
-    /**
-     * Access Token Scope
-     *
-     * RFC6749: The authorization and token endpoints allow the client to specify the
-     * scope of the access request using the "scope" request parameter.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-3.3
-     *
-     * @var string
-     */
-    protected $scope = '';
-
-    /**
-     * Base URL to provider API
-     *
-     * This var will be used to build urls when sending signed requests
-     *
-     * @var string
-     */
-    protected $apiBaseUrl = '';
-
-    /**
-     * Authorization Endpoint
-     *
-     * RFC6749: The authorization endpoint is used to interact with the resource
-     * owner and obtain an authorization grant.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-3.1
-     *
-     * @var string
-     */
-    protected $authorizeUrl = '';
-
-    /**
-     * Access Token Endpoint
-     *
-     * RFC6749: The token endpoint is used by the client to obtain an access token by
-     * presenting its authorization grant or refresh token.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-3.2
-     *
-     * @var string
-     */
-    protected $accessTokenUrl = '';
-
-    /**
-     * TokenInfo endpoint
-     *
-     * Access token validation. OPTIONAL.
-     *
-     * @var string
-     */
-    protected $accessTokenInfoUrl = '';
-
-    /**
-     * IPD API Documentation
-     *
-     * OPTIONAL.
-     *
-     * @var string
-     */
-    protected $apiDocumentation = '';
-
-    /**
-     * Redirection Endpoint or Callback
-     *
-     * RFC6749: After completing its interaction with the resource owner, the
-     * authorization server directs the resource owner's user-agent back to
-     * the client.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-3.1.2
-     *
-     * @var string
-     */
-    protected $callback = '';
-
-    /**
-     * Authorization Url Parameters
-     *
-     * @var array
-     */
-    protected $AuthorizeUrlParameters = [];
-
-
-    /**
-     * Authorization Url Parameter encoding type
-     * @see https://www.php.net/manual/de/function.http-build-query.php
-     *
-     * @var string
-     */
-    protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC1738;
-
-    /**
-     * Authorization Request State
-     *
-     * @var bool
-     */
-    protected $supportRequestState = true;
-
-    /**
-     * Access Token name
-     *
-     * While most providers will use 'access_token' as name for the Access Token attribute, other do not.
-     * On the latter case, this should be set by sub classes.
-     *
-     * @var string
-     */
-    protected $accessTokenName = 'access_token';
-
-    /**
-     * Authorization Request HTTP method.
-     *
-     * @see exchangeCodeForAccessToken()
-     *
-     * @var string
-     */
-    protected $tokenExchangeMethod = 'POST';
-
-    /**
-     * Authorization Request URL parameters.
-     *
-     * Sub classes may change add any additional parameter when necessary.
-     *
-     * @see exchangeCodeForAccessToken()
-     *
-     * @var array
-     */
-    protected $tokenExchangeParameters = [];
-
-    /**
-     * Authorization Request HTTP headers.
-     *
-     * Sub classes may add any additional header when necessary.
-     *
-     * @see exchangeCodeForAccessToken()
-     *
-     * @var array
-     */
-    protected $tokenExchangeHeaders = [];
-
-    /**
-     * Refresh Token Request HTTP method.
-     *
-     * @see refreshAccessToken()
-     *
-     * @var string
-     */
-    protected $tokenRefreshMethod = 'POST';
-
-    /**
-     * Refresh Token Request URL parameters.
-     *
-     * Sub classes may change add any additional parameter when necessary.
-     *
-     * @see refreshAccessToken()
-     *
-     * @var array|null
-     */
-    protected $tokenRefreshParameters = null;
-
-    /**
-     * Refresh Token Request HTTP headers.
-     *
-     * Sub classes may add any additional header when necessary.
-     *
-     * @see refreshAccessToken()
-     *
-     * @var array
-     */
-    protected $tokenRefreshHeaders = [];
-
-    /**
-     * Authorization Request URL parameters.
-     *
-     * Sub classes may change add any additional parameter when necessary.
-     *
-     * @see apiRequest()
-     *
-     * @var array
-     */
-    protected $apiRequestParameters = [];
-
-    /**
-     * Authorization Request HTTP headers.
-     *
-     * Sub classes may add any additional header when necessary.
-     *
-     * @see apiRequest()
-     *
-     * @var array
-     */
-    protected $apiRequestHeaders = [];
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
-        $this->clientSecret = $this->config->filter('keys')->get('secret');
-
-        if (!$this->clientId || !$this->clientSecret) {
-            throw new InvalidApplicationCredentialsException(
-                'Your application id is required in order to connect to ' . $this->providerId
-            );
-        }
-
-        $this->scope = $this->config->exists('scope') ? $this->config->get('scope') : $this->scope;
-
-        if ($this->config->exists('tokens')) {
-            $this->setAccessToken($this->config->get('tokens'));
-        }
+	/**
+	 * Client Identifier
+	 *
+	 * RFC6749: client_id REQUIRED. The client identifier issued to the client during
+	 * the registration process described by Section 2.2.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-2.2
+	 *
+	 * @var string
+	 */
+	protected $clientId = '';
+
+	/**
+	 * Client Secret
+	 *
+	 * RFC6749: client_secret REQUIRED. The client secret. The client MAY omit the
+	 * parameter if the client secret is an empty string.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-2.2
+	 *
+	 * @var string
+	 */
+	protected $clientSecret = '';
+
+	/**
+	 * Access Token Scope
+	 *
+	 * RFC6749: The authorization and token endpoints allow the client to specify the
+	 * scope of the access request using the "scope" request parameter.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-3.3
+	 *
+	 * @var string
+	 */
+	protected $scope = '';
+
+	/**
+	 * Base URL to provider API
+	 *
+	 * This var will be used to build urls when sending signed requests
+	 *
+	 * @var string
+	 */
+	protected $apiBaseUrl = '';
+
+	/**
+	 * Authorization Endpoint
+	 *
+	 * RFC6749: The authorization endpoint is used to interact with the resource
+	 * owner and obtain an authorization grant.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-3.1
+	 *
+	 * @var string
+	 */
+	protected $authorizeUrl = '';
+
+	/**
+	 * Access Token Endpoint
+	 *
+	 * RFC6749: The token endpoint is used by the client to obtain an access token by
+	 * presenting its authorization grant or refresh token.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-3.2
+	 *
+	 * @var string
+	 */
+	protected $accessTokenUrl = '';
+
+	/**
+	 * TokenInfo endpoint
+	 *
+	 * Access token validation. OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $accessTokenInfoUrl = '';
+
+	/**
+	 * IPD API Documentation
+	 *
+	 * OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $apiDocumentation = '';
+
+	/**
+	 * Redirection Endpoint or Callback
+	 *
+	 * RFC6749: After completing its interaction with the resource owner, the
+	 * authorization server directs the resource owner's user-agent back to
+	 * the client.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-3.1.2
+	 *
+	 * @var string
+	 */
+	protected $callback = '';
+
+	/**
+	 * Authorization Url Parameters
+	 *
+	 * @var array
+	 */
+	protected $AuthorizeUrlParameters = [];
+
+
+	/**
+	 * Authorization Url Parameter encoding type
+	 * @see https://www.php.net/manual/de/function.http-build-query.php
+	 *
+	 * @var string
+	 */
+	protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC1738;
+
+	/**
+	 * Authorization Request State
+	 *
+	 * @var bool
+	 */
+	protected $supportRequestState = true;
+
+	/**
+	 * Access Token name
+	 *
+	 * While most providers will use 'access_token' as name for the Access Token attribute, other do not.
+	 * On the latter case, this should be set by sub classes.
+	 *
+	 * @var string
+	 */
+	protected $accessTokenName = 'access_token';
+
+	/**
+	 * Authorization Request HTTP method.
+	 *
+	 * @see exchangeCodeForAccessToken()
+	 *
+	 * @var string
+	 */
+	protected $tokenExchangeMethod = 'POST';
+
+	/**
+	 * Authorization Request URL parameters.
+	 *
+	 * Sub classes may change add any additional parameter when necessary.
+	 *
+	 * @see exchangeCodeForAccessToken()
+	 *
+	 * @var array
+	 */
+	protected $tokenExchangeParameters = [];
+
+	/**
+	 * Authorization Request HTTP headers.
+	 *
+	 * Sub classes may add any additional header when necessary.
+	 *
+	 * @see exchangeCodeForAccessToken()
+	 *
+	 * @var array
+	 */
+	protected $tokenExchangeHeaders = [];
+
+	/**
+	 * Refresh Token Request HTTP method.
+	 *
+	 * @see refreshAccessToken()
+	 *
+	 * @var string
+	 */
+	protected $tokenRefreshMethod = 'POST';
+
+	/**
+	 * Refresh Token Request URL parameters.
+	 *
+	 * Sub classes may change add any additional parameter when necessary.
+	 *
+	 * @see refreshAccessToken()
+	 *
+	 * @var array|null
+	 */
+	protected $tokenRefreshParameters = null;
+
+	/**
+	 * Refresh Token Request HTTP headers.
+	 *
+	 * Sub classes may add any additional header when necessary.
+	 *
+	 * @see refreshAccessToken()
+	 *
+	 * @var array
+	 */
+	protected $tokenRefreshHeaders = [];
+
+	/**
+	 * Authorization Request URL parameters.
+	 *
+	 * Sub classes may change add any additional parameter when necessary.
+	 *
+	 * @see apiRequest()
+	 *
+	 * @var array
+	 */
+	protected $apiRequestParameters = [];
+
+	/**
+	 * Authorization Request HTTP headers.
+	 *
+	 * Sub classes may add any additional header when necessary.
+	 *
+	 * @see apiRequest()
+	 *
+	 * @var array
+	 */
+	protected $apiRequestHeaders = [];
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this->clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
+		$this->clientSecret = $this->config->filter('keys')->get('secret');
+
+		if (!$this->clientId || !$this->clientSecret) {
+			throw new InvalidApplicationCredentialsException(
+				'Your application id is required in order to connect to ' . $this->providerId
+			);
+		}
+
+		$this->scope = $this->config->exists('scope') ? $this->config->get('scope') : $this->scope;
+
+		if ($this->config->exists('tokens')) {
+			$this->setAccessToken($this->config->get('tokens'));
+		}
         
-        if ($this->config->exists('supportRequestState')) {
-            $this->supportRequestState = $this->config->get('supportRequestState');
-        }
-
-        $this->setCallback($this->config->get('callback'));
-        $this->setApiEndpoints($this->config->get('endpoints'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        $this->AuthorizeUrlParameters = [
-            'response_type' => 'code',
-            'client_id' => $this->clientId,
-            'redirect_uri' => $this->callback,
-            'scope' => $this->scope,
-        ];
-
-        $this->tokenExchangeParameters = [
-            'client_id' => $this->clientId,
-            'client_secret' => $this->clientSecret,
-            'grant_type' => 'authorization_code',
-            'redirect_uri' => $this->callback
-        ];
-
-        $refreshToken = $this->getStoredData('refresh_token');
-        if (!empty($refreshToken)) {
-            $this->tokenRefreshParameters = [
-                'grant_type' => 'refresh_token',
-                'refresh_token' => $refreshToken,
-            ];
-        }
-
-        $this->apiRequestHeaders = [
-            'Authorization' => 'Bearer ' . $this->getStoredData('access_token')
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate()
-    {
-        $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-
-        if ($this->isConnected()) {
-            return true;
-        }
-
-        try {
-            $this->authenticateCheckError();
-
-            $code = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'code');
-
-            if (empty($code)) {
-                $this->authenticateBegin();
-            } else {
-                $this->authenticateFinish();
-            }
-        } catch (Exception $e) {
-            $this->clearStoredData();
-
-            throw $e;
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        if ((bool)$this->getStoredData('access_token')) {
-            return (!$this->hasAccessTokenExpired() || $this->isRefreshTokenAvailable());
-        }
-        return false;
-    }
-
-    /**
-     * If we can use a refresh token, then an expired token does not stop us being connected.
-     *
-     * @return bool
-     */
-    public function isRefreshTokenAvailable()
-    {
-        return is_array($this->tokenRefreshParameters);
-    }
-
-    /**
-     * Authorization Request Error Response
-     *
-     * RFC6749: If the request fails due to a missing, invalid, or mismatching
-     * redirection URI, or if the client identifier is missing or invalid,
-     * the authorization server SHOULD inform the resource owner of the error.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-4.1.2.1
-     *
-     * @throws \Hybridauth\Exception\InvalidAuthorizationCodeException
-     * @throws \Hybridauth\Exception\AuthorizationDeniedException
-     */
-    protected function authenticateCheckError()
-    {
-        $error = filter_input(INPUT_GET, 'error', FILTER_SANITIZE_SPECIAL_CHARS);
-
-        if (!empty($error)) {
-            $error_description = filter_input(INPUT_GET, 'error_description', FILTER_SANITIZE_SPECIAL_CHARS);
-            $error_uri = filter_input(INPUT_GET, 'error_uri', FILTER_SANITIZE_SPECIAL_CHARS);
-
-            $collated_error = sprintf('Provider returned an error: %s %s %s', $error, $error_description, $error_uri);
-
-            if ($error == 'access_denied') {
-                throw new AuthorizationDeniedException($collated_error);
-            }
-
-            throw new InvalidAuthorizationCodeException($collated_error);
-        }
-    }
-
-    /**
-     * Initiate the authorization protocol
-     *
-     * Build Authorization URL for Authorization Request and redirect the user-agent to the
-     * Authorization Server.
-     */
-    protected function authenticateBegin()
-    {
-        $authUrl = $this->getAuthorizeUrl();
-
-        $this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
-
-        HttpClient\Util::redirect($authUrl);
-    }
-
-    /**
-     * Finalize the authorization process
-     *
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws InvalidAccessTokenException
-     * @throws InvalidAuthorizationStateException
-     */
-    protected function authenticateFinish()
-    {
-        $this->logger->debug(
-            sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
-            [HttpClient\Util::getCurrentUrl(true)]
-        );
-
-        $state = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'state');
-        $code = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'code');
-
-        /**
-         * Authorization Request State
-         *
-         * RFC6749: state : RECOMMENDED. An opaque value used by the client to maintain
-         * state between the request and callback. The authorization server includes
-         * this value when redirecting the user-agent back to the client.
-         *
-         * http://tools.ietf.org/html/rfc6749#section-4.1.1
-         */
-        if ($this->supportRequestState
-            && $this->getStoredData('authorization_state') != $state
-        ) {
-            throw new InvalidAuthorizationStateException(
-                'The authorization state [state=' . substr(htmlentities($state), 0, 100) . '] '
-                . 'of this page is either invalid or has already been consumed.'
-            );
-        }
-
-        /**
-         * Authorization Request Code
-         *
-         * RFC6749: If the resource owner grants the access request, the authorization
-         * server issues an authorization code and delivers it to the client:
-         *
-         * http://tools.ietf.org/html/rfc6749#section-4.1.2
-         */
-        $response = $this->exchangeCodeForAccessToken($code);
-
-        $this->validateAccessTokenExchange($response);
-
-        $this->initialize();
-    }
-
-    /**
-     * Build Authorization URL for Authorization Request
-     *
-     * RFC6749: The client constructs the request URI by adding the following
-     * $parameters to the query component of the authorization endpoint URI:
-     *
-     *    - response_type  REQUIRED. Value MUST be set to "code".
-     *    - client_id      REQUIRED.
-     *    - redirect_uri   OPTIONAL.
-     *    - scope          OPTIONAL.
-     *    - state          RECOMMENDED.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-4.1.1
-     *
-     * Sub classes may redefine this method when necessary.
-     *
-     * @param array $parameters
-     *
-     * @return string Authorization URL
-     */
-    protected function getAuthorizeUrl($parameters = [])
-    {
-        $this->AuthorizeUrlParameters = !empty($parameters)
-            ? $parameters
-            : array_replace(
-                (array)$this->AuthorizeUrlParameters,
-                (array)$this->config->get('authorize_url_parameters')
-            );
-
-        if ($this->supportRequestState) {
-            if (!isset($this->AuthorizeUrlParameters['state'])) {
-                $this->AuthorizeUrlParameters['state'] = 'HA-' . str_shuffle('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890');
-            }
-
-            $this->storeData('authorization_state', $this->AuthorizeUrlParameters['state']);
-        }
-
-        $queryParams = http_build_query($this->AuthorizeUrlParameters, '', '&', $this->AuthorizeUrlParametersEncType);
-        return $this->authorizeUrl . '?' . $queryParams;
-    }
-
-    /**
-     * Access Token Request
-     *
-     * This method will exchange the received $code in loginFinish() with an Access Token.
-     *
-     * RFC6749: The client makes a request to the token endpoint by sending the
-     * following parameters using the "application/x-www-form-urlencoded"
-     * with a character encoding of UTF-8 in the HTTP request entity-body:
-     *
-     *    - grant_type    REQUIRED. Value MUST be set to "authorization_code".
-     *    - code          REQUIRED. The authorization code received from the authorization server.
-     *    - redirect_uri  REQUIRED.
-     *    - client_id     REQUIRED.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-4.1.3
-     *
-     * @param string $code
-     *
-     * @return string Raw Provider API response
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     */
-    protected function exchangeCodeForAccessToken($code)
-    {
-        $this->tokenExchangeParameters['code'] = $code;
-
-        $response = $this->httpClient->request(
-            $this->accessTokenUrl,
-            $this->tokenExchangeMethod,
-            $this->tokenExchangeParameters,
-            $this->tokenExchangeHeaders
-        );
-
-        $this->validateApiResponse('Unable to exchange code for API access token');
-
-        return $response;
-    }
-
-    /**
-     * Validate Access Token Response
-     *
-     * RFC6749: If the access token request is valid and authorized, the
-     * authorization server issues an access token and optional refresh token.
-     * If the request client authentication failed or is invalid, the authorization
-     * server returns an error response as described in Section 5.2.
-     *
-     * Example of a successful response:
-     *
-     *  HTTP/1.1 200 OK
-     *  Content-Type: application/json;charset=UTF-8
-     *  Cache-Control: no-store
-     *  Pragma: no-cache
-     *
-     *  {
-     *      "access_token":"2YotnFZFEjr1zCsicMWpAA",
-     *      "token_type":"example",
-     *      "expires_in":3600,
-     *      "refresh_token":"tGzv3JOkF0XG5Qx2TlKWIA",
-     *      "example_parameter":"example_value"
-     *  }
-     *
-     * http://tools.ietf.org/html/rfc6749#section-4.1.4
-     *
-     * This method uses Data_Parser to attempt to decodes the raw $response (usually JSON)
-     * into a data collection.
-     *
-     * @param string $response
-     *
-     * @return \Hybridauth\Data\Collection
-     * @throws InvalidAccessTokenException
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $data = (new Data\Parser())->parse($response);
-
-        $collection = new Data\Collection($data);
-
-        if (!$collection->exists('access_token')) {
-            throw new InvalidAccessTokenException(
-                'Provider returned no access_token: ' . htmlentities($response)
-            );
-        }
-
-        $this->storeData('access_token', $collection->get('access_token'));
-        $this->storeData('token_type', $collection->get('token_type'));
-
-        if ($collection->get('refresh_token')) {
-            $this->storeData('refresh_token', $collection->get('refresh_token'));
-        }
-
-        // calculate when the access token expire
-        if ($collection->exists('expires_in')) {
-            $expires_at = time() + (int)$collection->get('expires_in');
-
-            $this->storeData('expires_in', $collection->get('expires_in'));
-            $this->storeData('expires_at', $expires_at);
-        }
-
-        $this->deleteStoredData('authorization_state');
-
-        $this->initialize();
-
-        return $collection;
-    }
-
-    /**
-     * Refreshing an Access Token
-     *
-     * RFC6749: If the authorization server issued a refresh token to the
-     * client, the client makes a refresh request to the token endpoint by
-     * adding the following parameters ... in the HTTP request entity-body:
-     *
-     *    - grant_type     REQUIRED. Value MUST be set to "refresh_token".
-     *    - refresh_token  REQUIRED. The refresh token issued to the client.
-     *    - scope          OPTIONAL.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-6
-     *
-     * This method is similar to exchangeCodeForAccessToken(). The only
-     * difference is here we exchange refresh_token for a new access_token.
-     *
-     * @param array $parameters
-     *
-     * @return string|null Raw Provider API response, or null if we cannot refresh
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws InvalidAccessTokenException
-     */
-    public function refreshAccessToken($parameters = [])
-    {
-        $this->tokenRefreshParameters = !empty($parameters)
-            ? $parameters
-            : $this->tokenRefreshParameters;
-
-        if (!$this->isRefreshTokenAvailable()) {
-            return null;
-        }
-
-        $response = $this->httpClient->request(
-            $this->accessTokenUrl,
-            $this->tokenRefreshMethod,
-            $this->tokenRefreshParameters,
-            $this->tokenRefreshHeaders
-        );
-
-        $this->validateApiResponse('Unable to refresh the access token');
-
-        $this->validateRefreshAccessToken($response);
-
-        return $response;
-    }
-
-    /**
-     * Check whether access token has expired
-     *
-     * @param int|null $time
-     * @return bool|null
-     */
-    public function hasAccessTokenExpired($time = null)
-    {
-        if ($time === null) {
-            $time = time();
-        }
-
-        $expires_at = $this->getStoredData('expires_at');
-        if (!$expires_at) {
-            return null;
-        }
-
-        return $expires_at <= $time;
-    }
-
-    /**
-     * Validate Refresh Access Token Request
-     *
-     * RFC6749: If valid and authorized, the authorization server issues an
-     * access token as described in Section 5.1.  If the request failed
-     * verification or is invalid, the authorization server returns an error
-     * response as described in Section 5.2.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-6
-     * http://tools.ietf.org/html/rfc6749#section-5.1
-     * http://tools.ietf.org/html/rfc6749#section-5.2
-     *
-     * This method simply use validateAccessTokenExchange(), however sub
-     * classes may redefine it when necessary.
-     *
-     * @param $response
-     *
-     * @return \Hybridauth\Data\Collection
-     * @throws InvalidAccessTokenException
-     */
-    protected function validateRefreshAccessToken($response)
-    {
-        return $this->validateAccessTokenExchange($response);
-    }
-
-    /**
-     * Send a signed request to provider API
-     *
-     * RFC6749: Accessing Protected Resources: The client accesses protected
-     * resources by presenting the access token to the resource server. The
-     * resource server MUST validate the access token and ensure that it has
-     * not expired and that its scope covers the requested resource.
-     *
-     * Note: Since the specifics of error responses is beyond the scope of
-     * RFC6749 and OAuth specifications, Hybridauth will consider any HTTP
-     * status code that is different than '200 OK' as an ERROR.
-     *
-     * http://tools.ietf.org/html/rfc6749#section-7
-     *
-     * @param string $url
-     * @param string $method
-     * @param array $parameters
-     * @param array $headers
-     * @param bool $multipart
-     *
-     * @return mixed
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws InvalidAccessTokenException
-     */
-    public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        // refresh tokens if needed
-        $this->maintainToken();
-        if ($this->hasAccessTokenExpired() === true) {
-            $this->refreshAccessToken();
-        }
-
-        if (strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0) {
-            $url = rtrim($this->apiBaseUrl, '/') . '/' . ltrim($url, '/');
-        }
-
-        $parameters = array_replace($this->apiRequestParameters, (array)$parameters);
-        $headers = array_replace($this->apiRequestHeaders, (array)$headers);
-
-        $response = $this->httpClient->request(
-            $url,
-            $method,     // HTTP Request Method. Defaults to GET.
-            $parameters, // Request Parameters
-            $headers,    // Request Headers
-            $multipart   // Is request multipart
-        );
-
-        $this->validateApiResponse('Signed API request to ' . $url . ' has returned an error');
-
-        $response = (new Data\Parser())->parse($response);
-
-        return $response;
-    }
+		if ($this->config->exists('supportRequestState')) {
+			$this->supportRequestState = $this->config->get('supportRequestState');
+		}
+
+		$this->setCallback($this->config->get('callback'));
+		$this->setApiEndpoints($this->config->get('endpoints'));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		$this->AuthorizeUrlParameters = [
+			'response_type' => 'code',
+			'client_id' => $this->clientId,
+			'redirect_uri' => $this->callback,
+			'scope' => $this->scope,
+		];
+
+		$this->tokenExchangeParameters = [
+			'client_id' => $this->clientId,
+			'client_secret' => $this->clientSecret,
+			'grant_type' => 'authorization_code',
+			'redirect_uri' => $this->callback
+		];
+
+		$refreshToken = $this->getStoredData('refresh_token');
+		if (!empty($refreshToken)) {
+			$this->tokenRefreshParameters = [
+				'grant_type' => 'refresh_token',
+				'refresh_token' => $refreshToken,
+			];
+		}
+
+		$this->apiRequestHeaders = [
+			'Authorization' => 'Bearer ' . $this->getStoredData('access_token')
+		];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticate()
+	{
+		$this->logger->info(sprintf('%s::authenticate()', get_class($this)));
+
+		if ($this->isConnected()) {
+			return true;
+		}
+
+		try {
+			$this->authenticateCheckError();
+
+			$code = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'code');
+
+			if (empty($code)) {
+				$this->authenticateBegin();
+			} else {
+				$this->authenticateFinish();
+			}
+		} catch (Exception $e) {
+			$this->clearStoredData();
+
+			throw $e;
+		}
+
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConnected()
+	{
+		if ((bool)$this->getStoredData('access_token')) {
+			return (!$this->hasAccessTokenExpired() || $this->isRefreshTokenAvailable());
+		}
+		return false;
+	}
+
+	/**
+	 * If we can use a refresh token, then an expired token does not stop us being connected.
+	 *
+	 * @return bool
+	 */
+	public function isRefreshTokenAvailable()
+	{
+		return is_array($this->tokenRefreshParameters);
+	}
+
+	/**
+	 * Authorization Request Error Response
+	 *
+	 * RFC6749: If the request fails due to a missing, invalid, or mismatching
+	 * redirection URI, or if the client identifier is missing or invalid,
+	 * the authorization server SHOULD inform the resource owner of the error.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-4.1.2.1
+	 *
+	 * @throws \Hybridauth\Exception\InvalidAuthorizationCodeException
+	 * @throws \Hybridauth\Exception\AuthorizationDeniedException
+	 */
+	protected function authenticateCheckError()
+	{
+		$error = filter_input(INPUT_GET, 'error', FILTER_SANITIZE_SPECIAL_CHARS);
+
+		if (!empty($error)) {
+			$error_description = filter_input(INPUT_GET, 'error_description', FILTER_SANITIZE_SPECIAL_CHARS);
+			$error_uri = filter_input(INPUT_GET, 'error_uri', FILTER_SANITIZE_SPECIAL_CHARS);
+
+			$collated_error = sprintf('Provider returned an error: %s %s %s', $error, $error_description, $error_uri);
+
+			if ($error == 'access_denied') {
+				throw new AuthorizationDeniedException($collated_error);
+			}
+
+			throw new InvalidAuthorizationCodeException($collated_error);
+		}
+	}
+
+	/**
+	 * Initiate the authorization protocol
+	 *
+	 * Build Authorization URL for Authorization Request and redirect the user-agent to the
+	 * Authorization Server.
+	 */
+	protected function authenticateBegin()
+	{
+		$authUrl = $this->getAuthorizeUrl();
+
+		$this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
+
+		HttpClient\Util::redirect($authUrl);
+	}
+
+	/**
+	 * Finalize the authorization process
+	 *
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws InvalidAccessTokenException
+	 * @throws InvalidAuthorizationStateException
+	 */
+	protected function authenticateFinish()
+	{
+		$this->logger->debug(
+			sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
+			[HttpClient\Util::getCurrentUrl(true)]
+		);
+
+		$state = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'state');
+		$code = filter_input($_SERVER['REQUEST_METHOD'] === 'POST' ? INPUT_POST : INPUT_GET, 'code');
+
+		/**
+		 * Authorization Request State
+		 *
+		 * RFC6749: state : RECOMMENDED. An opaque value used by the client to maintain
+		 * state between the request and callback. The authorization server includes
+		 * this value when redirecting the user-agent back to the client.
+		 *
+		 * http://tools.ietf.org/html/rfc6749#section-4.1.1
+		 */
+		if ($this->supportRequestState
+			&& $this->getStoredData('authorization_state') != $state
+		) {
+			throw new InvalidAuthorizationStateException(
+				'The authorization state [state=' . substr(htmlentities($state), 0, 100) . '] '
+				. 'of this page is either invalid or has already been consumed.'
+			);
+		}
+
+		/**
+		 * Authorization Request Code
+		 *
+		 * RFC6749: If the resource owner grants the access request, the authorization
+		 * server issues an authorization code and delivers it to the client:
+		 *
+		 * http://tools.ietf.org/html/rfc6749#section-4.1.2
+		 */
+		$response = $this->exchangeCodeForAccessToken($code);
+
+		$this->validateAccessTokenExchange($response);
+
+		$this->initialize();
+	}
+
+	/**
+	 * Build Authorization URL for Authorization Request
+	 *
+	 * RFC6749: The client constructs the request URI by adding the following
+	 * $parameters to the query component of the authorization endpoint URI:
+	 *
+	 *    - response_type  REQUIRED. Value MUST be set to "code".
+	 *    - client_id      REQUIRED.
+	 *    - redirect_uri   OPTIONAL.
+	 *    - scope          OPTIONAL.
+	 *    - state          RECOMMENDED.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-4.1.1
+	 *
+	 * Sub classes may redefine this method when necessary.
+	 *
+	 * @param array $parameters
+	 *
+	 * @return string Authorization URL
+	 */
+	protected function getAuthorizeUrl($parameters = [])
+	{
+		$this->AuthorizeUrlParameters = !empty($parameters)
+			? $parameters
+			: array_replace(
+				(array)$this->AuthorizeUrlParameters,
+				(array)$this->config->get('authorize_url_parameters')
+			);
+
+		if ($this->supportRequestState) {
+			if (!isset($this->AuthorizeUrlParameters['state'])) {
+				$this->AuthorizeUrlParameters['state'] = 'HA-' . str_shuffle('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890');
+			}
+
+			$this->storeData('authorization_state', $this->AuthorizeUrlParameters['state']);
+		}
+
+		$queryParams = http_build_query($this->AuthorizeUrlParameters, '', '&', $this->AuthorizeUrlParametersEncType);
+		return $this->authorizeUrl . '?' . $queryParams;
+	}
+
+	/**
+	 * Access Token Request
+	 *
+	 * This method will exchange the received $code in loginFinish() with an Access Token.
+	 *
+	 * RFC6749: The client makes a request to the token endpoint by sending the
+	 * following parameters using the "application/x-www-form-urlencoded"
+	 * with a character encoding of UTF-8 in the HTTP request entity-body:
+	 *
+	 *    - grant_type    REQUIRED. Value MUST be set to "authorization_code".
+	 *    - code          REQUIRED. The authorization code received from the authorization server.
+	 *    - redirect_uri  REQUIRED.
+	 *    - client_id     REQUIRED.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-4.1.3
+	 *
+	 * @param string $code
+	 *
+	 * @return string Raw Provider API response
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 */
+	protected function exchangeCodeForAccessToken($code)
+	{
+		$this->tokenExchangeParameters['code'] = $code;
+
+		$response = $this->httpClient->request(
+			$this->accessTokenUrl,
+			$this->tokenExchangeMethod,
+			$this->tokenExchangeParameters,
+			$this->tokenExchangeHeaders
+		);
+
+		$this->validateApiResponse('Unable to exchange code for API access token');
+
+		return $response;
+	}
+
+	/**
+	 * Validate Access Token Response
+	 *
+	 * RFC6749: If the access token request is valid and authorized, the
+	 * authorization server issues an access token and optional refresh token.
+	 * If the request client authentication failed or is invalid, the authorization
+	 * server returns an error response as described in Section 5.2.
+	 *
+	 * Example of a successful response:
+	 *
+	 *  HTTP/1.1 200 OK
+	 *  Content-Type: application/json;charset=UTF-8
+	 *  Cache-Control: no-store
+	 *  Pragma: no-cache
+	 *
+	 *  {
+	 *      "access_token":"2YotnFZFEjr1zCsicMWpAA",
+	 *      "token_type":"example",
+	 *      "expires_in":3600,
+	 *      "refresh_token":"tGzv3JOkF0XG5Qx2TlKWIA",
+	 *      "example_parameter":"example_value"
+	 *  }
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-4.1.4
+	 *
+	 * This method uses Data_Parser to attempt to decodes the raw $response (usually JSON)
+	 * into a data collection.
+	 *
+	 * @param string $response
+	 *
+	 * @return \Hybridauth\Data\Collection
+	 * @throws InvalidAccessTokenException
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$data = (new Data\Parser())->parse($response);
+
+		$collection = new Data\Collection($data);
+
+		if (!$collection->exists('access_token')) {
+			throw new InvalidAccessTokenException(
+				'Provider returned no access_token: ' . htmlentities($response)
+			);
+		}
+
+		$this->storeData('access_token', $collection->get('access_token'));
+		$this->storeData('token_type', $collection->get('token_type'));
+
+		if ($collection->get('refresh_token')) {
+			$this->storeData('refresh_token', $collection->get('refresh_token'));
+		}
+
+		// calculate when the access token expire
+		if ($collection->exists('expires_in')) {
+			$expires_at = time() + (int)$collection->get('expires_in');
+
+			$this->storeData('expires_in', $collection->get('expires_in'));
+			$this->storeData('expires_at', $expires_at);
+		}
+
+		$this->deleteStoredData('authorization_state');
+
+		$this->initialize();
+
+		return $collection;
+	}
+
+	/**
+	 * Refreshing an Access Token
+	 *
+	 * RFC6749: If the authorization server issued a refresh token to the
+	 * client, the client makes a refresh request to the token endpoint by
+	 * adding the following parameters ... in the HTTP request entity-body:
+	 *
+	 *    - grant_type     REQUIRED. Value MUST be set to "refresh_token".
+	 *    - refresh_token  REQUIRED. The refresh token issued to the client.
+	 *    - scope          OPTIONAL.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-6
+	 *
+	 * This method is similar to exchangeCodeForAccessToken(). The only
+	 * difference is here we exchange refresh_token for a new access_token.
+	 *
+	 * @param array $parameters
+	 *
+	 * @return string|null Raw Provider API response, or null if we cannot refresh
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws InvalidAccessTokenException
+	 */
+	public function refreshAccessToken($parameters = [])
+	{
+		$this->tokenRefreshParameters = !empty($parameters)
+			? $parameters
+			: $this->tokenRefreshParameters;
+
+		if (!$this->isRefreshTokenAvailable()) {
+			return null;
+		}
+
+		$response = $this->httpClient->request(
+			$this->accessTokenUrl,
+			$this->tokenRefreshMethod,
+			$this->tokenRefreshParameters,
+			$this->tokenRefreshHeaders
+		);
+
+		$this->validateApiResponse('Unable to refresh the access token');
+
+		$this->validateRefreshAccessToken($response);
+
+		return $response;
+	}
+
+	/**
+	 * Check whether access token has expired
+	 *
+	 * @param int|null $time
+	 * @return bool|null
+	 */
+	public function hasAccessTokenExpired($time = null)
+	{
+		if ($time === null) {
+			$time = time();
+		}
+
+		$expires_at = $this->getStoredData('expires_at');
+		if (!$expires_at) {
+			return null;
+		}
+
+		return $expires_at <= $time;
+	}
+
+	/**
+	 * Validate Refresh Access Token Request
+	 *
+	 * RFC6749: If valid and authorized, the authorization server issues an
+	 * access token as described in Section 5.1.  If the request failed
+	 * verification or is invalid, the authorization server returns an error
+	 * response as described in Section 5.2.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-6
+	 * http://tools.ietf.org/html/rfc6749#section-5.1
+	 * http://tools.ietf.org/html/rfc6749#section-5.2
+	 *
+	 * This method simply use validateAccessTokenExchange(), however sub
+	 * classes may redefine it when necessary.
+	 *
+	 * @param $response
+	 *
+	 * @return \Hybridauth\Data\Collection
+	 * @throws InvalidAccessTokenException
+	 */
+	protected function validateRefreshAccessToken($response)
+	{
+		return $this->validateAccessTokenExchange($response);
+	}
+
+	/**
+	 * Send a signed request to provider API
+	 *
+	 * RFC6749: Accessing Protected Resources: The client accesses protected
+	 * resources by presenting the access token to the resource server. The
+	 * resource server MUST validate the access token and ensure that it has
+	 * not expired and that its scope covers the requested resource.
+	 *
+	 * Note: Since the specifics of error responses is beyond the scope of
+	 * RFC6749 and OAuth specifications, Hybridauth will consider any HTTP
+	 * status code that is different than '200 OK' as an ERROR.
+	 *
+	 * http://tools.ietf.org/html/rfc6749#section-7
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param array $parameters
+	 * @param array $headers
+	 * @param bool $multipart
+	 *
+	 * @return mixed
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws InvalidAccessTokenException
+	 */
+	public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		// refresh tokens if needed
+		$this->maintainToken();
+		if ($this->hasAccessTokenExpired() === true) {
+			$this->refreshAccessToken();
+		}
+
+		if (strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0) {
+			$url = rtrim($this->apiBaseUrl, '/') . '/' . ltrim($url, '/');
+		}
+
+		$parameters = array_replace($this->apiRequestParameters, (array)$parameters);
+		$headers = array_replace($this->apiRequestHeaders, (array)$headers);
+
+		$response = $this->httpClient->request(
+			$url,
+			$method,     // HTTP Request Method. Defaults to GET.
+			$parameters, // Request Parameters
+			$headers,    // Request Headers
+			$multipart   // Is request multipart
+		);
+
+		$this->validateApiResponse('Signed API request to ' . $url . ' has returned an error');
+
+		$response = (new Data\Parser())->parse($response);
+
+		return $response;
+	}
 }

src/Adapter/DataStoreTrait.php

Indentation +54 added lines, -54 removed lines

@@ -12,63 +12,63 @@
  */
 trait DataStoreTrait
 {
-    /**
-     * Returns storage instance
-     *
-     * @return \Hybridauth\Storage\StorageInterface
-     */
-    abstract public function getStorage();
+	/**
+	 * Returns storage instance
+	 *
+	 * @return \Hybridauth\Storage\StorageInterface
+	 */
+	abstract public function getStorage();
 
-    /**
-     * Store a piece of data in storage.
-     *
-     * This method is mainly used for OAuth tokens (access, secret, refresh, and whatnot), but it
-     * can be also used by providers to store any other useful data (i.g., user_id, auth_nonce, etc.)
-     *
-     * @param string $name
-     * @param mixed $value
-     */
-    protected function storeData($name, $value = null)
-    {
-        // if empty, we simply delete the thing as we'd want to only store necessary data
-        if (empty($value)) {
-            $this->deleteStoredData($name);
-        }
+	/**
+	 * Store a piece of data in storage.
+	 *
+	 * This method is mainly used for OAuth tokens (access, secret, refresh, and whatnot), but it
+	 * can be also used by providers to store any other useful data (i.g., user_id, auth_nonce, etc.)
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 */
+	protected function storeData($name, $value = null)
+	{
+		// if empty, we simply delete the thing as we'd want to only store necessary data
+		if (empty($value)) {
+			$this->deleteStoredData($name);
+		}
 
-        $this->getStorage()->set($this->providerId . '.' . $name, $value);
-    }
+		$this->getStorage()->set($this->providerId . '.' . $name, $value);
+	}
 
-    /**
-     * Retrieve a piece of data from storage.
-     *
-     * This method is mainly used for OAuth tokens (access, secret, refresh, and whatnot), but it
-     * can be also used by providers to retrieve from store any other useful data (i.g., user_id,
-     * auth_nonce, etc.)
-     *
-     * @param string $name
-     *
-     * @return mixed
-     */
-    protected function getStoredData($name)
-    {
-        return $this->getStorage()->get($this->providerId . '.' . $name);
-    }
+	/**
+	 * Retrieve a piece of data from storage.
+	 *
+	 * This method is mainly used for OAuth tokens (access, secret, refresh, and whatnot), but it
+	 * can be also used by providers to retrieve from store any other useful data (i.g., user_id,
+	 * auth_nonce, etc.)
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	protected function getStoredData($name)
+	{
+		return $this->getStorage()->get($this->providerId . '.' . $name);
+	}
 
-    /**
-     * Delete a stored piece of data.
-     *
-     * @param string $name
-     */
-    protected function deleteStoredData($name)
-    {
-        $this->getStorage()->delete($this->providerId . '.' . $name);
-    }
+	/**
+	 * Delete a stored piece of data.
+	 *
+	 * @param string $name
+	 */
+	protected function deleteStoredData($name)
+	{
+		$this->getStorage()->delete($this->providerId . '.' . $name);
+	}
 
-    /**
-     * Delete all stored data of the instantiated adapter
-     */
-    protected function clearStoredData()
-    {
-        $this->getStorage()->deleteMatch($this->providerId . '.');
-    }
+	/**
+	 * Delete all stored data of the instantiated adapter
+	 */
+	protected function clearStoredData()
+	{
+		$this->getStorage()->deleteMatch($this->providerId . '.');
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
             $this->deleteStoredData($name);
         }
 
-        $this->getStorage()->set($this->providerId . '.' . $name, $value);
+        $this->getStorage()->set($this->providerId.'.'.$name, $value);
     }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     protected function getStoredData($name)
     {
-        return $this->getStorage()->get($this->providerId . '.' . $name);
+        return $this->getStorage()->get($this->providerId.'.'.$name);
     }
 
     /**
@@ -61,7 +61,7 @@ 
      */
     protected function deleteStoredData($name)
     {
-        $this->getStorage()->delete($this->providerId . '.' . $name);
+        $this->getStorage()->delete($this->providerId.'.'.$name);
     }
 
     /**
@@ -69,6 +69,6 @@ 
      */
     protected function clearStoredData()
     {
-        $this->getStorage()->deleteMatch($this->providerId . '.');
+        $this->getStorage()->deleteMatch($this->providerId.'.');
     }
 }