hybridauth / hybridauth

src/Provider/Twitter.php

Indentation +221 added lines, -221 removed lines

@@ -40,225 +40,225 @@
  */
 class Twitter extends OAuth1
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.twitter.com/1.1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://api.twitter.com/oauth/authenticate';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $requestTokenUrl = 'https://api.twitter.com/oauth/request_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.twitter.com/oauth/access_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://dev.twitter.com/web/sign-in/implementing';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAuthorizeUrl($parameters = [])
-    {
-        if ($this->config->get('authorize') === true) {
-            $this->authorizeUrl = 'https://api.twitter.com/oauth/authorize';
-        }
-
-        return parent::getAuthorizeUrl($parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('account/verify_credentials.json', 'GET', [
-            'include_email' => $this->config->get('include_email') === false ? 'false' : 'true',
-        ]);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id_str')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('id_str');
-        $userProfile->displayName = $data->get('screen_name');
-        $userProfile->description = $data->get('description');
-        $userProfile->firstName = $data->get('name');
-        $userProfile->email = $data->get('email');
-        $userProfile->emailVerified = $data->get('email');
-        $userProfile->webSiteURL = $data->get('url');
-        $userProfile->region = $data->get('location');
-
-        $userProfile->profileURL = $data->exists('screen_name')
-            ? ('https://twitter.com/' . $data->get('screen_name'))
-            : '';
-
-        $photoSize = $this->config->get('photo_size') ?: 'original';
-        $photoSize = $photoSize === 'original' ? '' : "_{$photoSize}";
-        $userProfile->photoURL = $data->exists('profile_image_url_https')
-            ? str_replace('_normal', $photoSize, $data->get('profile_image_url_https'))
-            : '';
-
-        $userProfile->data = [
-            'followed_by' => $data->get('followers_count'),
-            'follows' => $data->get('friends_count'),
-        ];
-
-        return $userProfile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts($parameters = [])
-    {
-        $parameters = ['cursor' => '-1'] + $parameters;
-
-        $response = $this->apiRequest('friends/ids.json', 'GET', $parameters);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('ids')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        if ($data->filter('ids')->isEmpty()) {
-            return [];
-        }
-
-        $contacts = [];
-
-        // 75 id per time should be okey
-        $contactsIds = array_chunk((array)$data->get('ids'), 75);
-
-        foreach ($contactsIds as $chunk) {
-            $parameters = ['user_id' => implode(',', $chunk)];
-
-            try {
-                $response = $this->apiRequest('users/lookup.json', 'GET', $parameters);
-
-                if ($response && count($response)) {
-                    foreach ($response as $item) {
-                        $contacts[] = $this->fetchUserContact($item);
-                    }
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-
-        return $contacts;
-    }
-
-    /**
-     * @param $item
-     *
-     * @return User\Contact
-     */
-    protected function fetchUserContact($item)
-    {
-        $item = new Data\Collection($item);
-
-        $userContact = new User\Contact();
-
-        $userContact->identifier = $item->get('id_str');
-        $userContact->displayName = $item->get('name');
-        $userContact->photoURL = $item->get('profile_image_url');
-        $userContact->description = $item->get('description');
-
-        $userContact->profileURL = $item->exists('screen_name')
-            ? ('https://twitter.com/' . $item->get('screen_name'))
-            : '';
-
-        return $userContact;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setUserStatus($status)
-    {
-        if (is_string($status)) {
-            $status = ['status' => $status];
-        }
-
-        // Prepare request parameters.
-        $params = [];
-        if (isset($status['status'])) {
-            $params['status'] = $status['status'];
-        }
-        if (isset($status['picture'])) {
-            $media = $this->apiRequest('https://upload.twitter.com/1.1/media/upload.json', 'POST', [
-                'media' => base64_encode(file_get_contents($status['picture'])),
-            ]);
-            $params['media_ids'] = $media->media_id;
-        }
-
-        $response = $this->apiRequest('statuses/update.json', 'POST', $params);
-
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserActivity($stream = 'me')
-    {
-        $apiUrl = ($stream == 'me')
-            ? 'statuses/user_timeline.json'
-            : 'statuses/home_timeline.json';
-
-        $response = $this->apiRequest($apiUrl);
-
-        if (!$response) {
-            return [];
-        }
-
-        $activities = [];
-
-        foreach ($response as $item) {
-            $activities[] = $this->fetchUserActivity($item);
-        }
-
-        return $activities;
-    }
-
-    /**
-     * @param $item
-     * @return User\Activity
-     */
-    protected function fetchUserActivity($item)
-    {
-        $item = new Data\Collection($item);
-
-        $userActivity = new User\Activity();
-
-        $userActivity->id = $item->get('id_str');
-        $userActivity->date = $item->get('created_at');
-        $userActivity->text = $item->get('text');
-
-        $userActivity->user->identifier = $item->filter('user')->get('id_str');
-        $userActivity->user->displayName = $item->filter('user')->get('name');
-        $userActivity->user->photoURL = $item->filter('user')->get('profile_image_url');
-
-        $userActivity->user->profileURL = $item->filter('user')->get('screen_name')
-            ? ('https://twitter.com/' . $item->filter('user')->get('screen_name'))
-            : '';
-
-        return $userActivity;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.twitter.com/1.1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://api.twitter.com/oauth/authenticate';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $requestTokenUrl = 'https://api.twitter.com/oauth/request_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.twitter.com/oauth/access_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://dev.twitter.com/web/sign-in/implementing';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function getAuthorizeUrl($parameters = [])
+	{
+		if ($this->config->get('authorize') === true) {
+			$this->authorizeUrl = 'https://api.twitter.com/oauth/authorize';
+		}
+
+		return parent::getAuthorizeUrl($parameters);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('account/verify_credentials.json', 'GET', [
+			'include_email' => $this->config->get('include_email') === false ? 'false' : 'true',
+		]);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id_str')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('id_str');
+		$userProfile->displayName = $data->get('screen_name');
+		$userProfile->description = $data->get('description');
+		$userProfile->firstName = $data->get('name');
+		$userProfile->email = $data->get('email');
+		$userProfile->emailVerified = $data->get('email');
+		$userProfile->webSiteURL = $data->get('url');
+		$userProfile->region = $data->get('location');
+
+		$userProfile->profileURL = $data->exists('screen_name')
+			? ('https://twitter.com/' . $data->get('screen_name'))
+			: '';
+
+		$photoSize = $this->config->get('photo_size') ?: 'original';
+		$photoSize = $photoSize === 'original' ? '' : "_{$photoSize}";
+		$userProfile->photoURL = $data->exists('profile_image_url_https')
+			? str_replace('_normal', $photoSize, $data->get('profile_image_url_https'))
+			: '';
+
+		$userProfile->data = [
+			'followed_by' => $data->get('followers_count'),
+			'follows' => $data->get('friends_count'),
+		];
+
+		return $userProfile;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts($parameters = [])
+	{
+		$parameters = ['cursor' => '-1'] + $parameters;
+
+		$response = $this->apiRequest('friends/ids.json', 'GET', $parameters);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('ids')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		if ($data->filter('ids')->isEmpty()) {
+			return [];
+		}
+
+		$contacts = [];
+
+		// 75 id per time should be okey
+		$contactsIds = array_chunk((array)$data->get('ids'), 75);
+
+		foreach ($contactsIds as $chunk) {
+			$parameters = ['user_id' => implode(',', $chunk)];
+
+			try {
+				$response = $this->apiRequest('users/lookup.json', 'GET', $parameters);
+
+				if ($response && count($response)) {
+					foreach ($response as $item) {
+						$contacts[] = $this->fetchUserContact($item);
+					}
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+
+		return $contacts;
+	}
+
+	/**
+	 * @param $item
+	 *
+	 * @return User\Contact
+	 */
+	protected function fetchUserContact($item)
+	{
+		$item = new Data\Collection($item);
+
+		$userContact = new User\Contact();
+
+		$userContact->identifier = $item->get('id_str');
+		$userContact->displayName = $item->get('name');
+		$userContact->photoURL = $item->get('profile_image_url');
+		$userContact->description = $item->get('description');
+
+		$userContact->profileURL = $item->exists('screen_name')
+			? ('https://twitter.com/' . $item->get('screen_name'))
+			: '';
+
+		return $userContact;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setUserStatus($status)
+	{
+		if (is_string($status)) {
+			$status = ['status' => $status];
+		}
+
+		// Prepare request parameters.
+		$params = [];
+		if (isset($status['status'])) {
+			$params['status'] = $status['status'];
+		}
+		if (isset($status['picture'])) {
+			$media = $this->apiRequest('https://upload.twitter.com/1.1/media/upload.json', 'POST', [
+				'media' => base64_encode(file_get_contents($status['picture'])),
+			]);
+			$params['media_ids'] = $media->media_id;
+		}
+
+		$response = $this->apiRequest('statuses/update.json', 'POST', $params);
+
+		return $response;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserActivity($stream = 'me')
+	{
+		$apiUrl = ($stream == 'me')
+			? 'statuses/user_timeline.json'
+			: 'statuses/home_timeline.json';
+
+		$response = $this->apiRequest($apiUrl);
+
+		if (!$response) {
+			return [];
+		}
+
+		$activities = [];
+
+		foreach ($response as $item) {
+			$activities[] = $this->fetchUserActivity($item);
+		}
+
+		return $activities;
+	}
+
+	/**
+	 * @param $item
+	 * @return User\Activity
+	 */
+	protected function fetchUserActivity($item)
+	{
+		$item = new Data\Collection($item);
+
+		$userActivity = new User\Activity();
+
+		$userActivity->id = $item->get('id_str');
+		$userActivity->date = $item->get('created_at');
+		$userActivity->text = $item->get('text');
+
+		$userActivity->user->identifier = $item->filter('user')->get('id_str');
+		$userActivity->user->displayName = $item->filter('user')->get('name');
+		$userActivity->user->photoURL = $item->filter('user')->get('profile_image_url');
+
+		$userActivity->user->profileURL = $item->filter('user')->get('screen_name')
+			? ('https://twitter.com/' . $item->filter('user')->get('screen_name'))
+			: '';
+
+		return $userActivity;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id_str')) {
+        if ( ! $data->exists('id_str')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -104,7 +104,7 @@ 
         $userProfile->region = $data->get('location');
 
         $userProfile->profileURL = $data->exists('screen_name')
-            ? ('https://twitter.com/' . $data->get('screen_name'))
+            ? ('https://twitter.com/'.$data->get('screen_name'))
             : '';
 
         $photoSize = $this->config->get('photo_size') ?: 'original';
@@ -132,7 +132,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('ids')) {
+        if ( ! $data->exists('ids')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -143,7 +143,7 @@ 
         $contacts = [];
 
         // 75 id per time should be okey
-        $contactsIds = array_chunk((array)$data->get('ids'), 75);
+        $contactsIds = array_chunk((array) $data->get('ids'), 75);
 
         foreach ($contactsIds as $chunk) {
             $parameters = ['user_id' => implode(',', $chunk)];
@@ -181,7 +181,7 @@ 
         $userContact->description = $item->get('description');
 
         $userContact->profileURL = $item->exists('screen_name')
-            ? ('https://twitter.com/' . $item->get('screen_name'))
+            ? ('https://twitter.com/'.$item->get('screen_name'))
             : '';
 
         return $userContact;
@@ -224,7 +224,7 @@ 
 
         $response = $this->apiRequest($apiUrl);
 
-        if (!$response) {
+        if ( ! $response) {
             return [];
         }
 
@@ -256,7 +256,7 @@ 
         $userActivity->user->photoURL = $item->filter('user')->get('profile_image_url');
 
         $userActivity->user->profileURL = $item->filter('user')->get('screen_name')
-            ? ('https://twitter.com/' . $item->filter('user')->get('screen_name'))
+            ? ('https://twitter.com/'.$item->filter('user')->get('screen_name'))
             : '';
 
         return $userActivity;

src/Provider/Keycloak.php

Spacing +6 added lines, -6 removed lines

@@ -48,24 +48,24 @@ 
     {
         parent::configure();
 
-        if (!$this->config->exists('url')) {
+        if ( ! $this->config->exists('url')) {
             throw new InvalidApplicationCredentialsException(
                 'You must define a provider url'
             );
         }
         $url = $this->config->get('url');
 
-        if (!$this->config->exists('realm')) {
+        if ( ! $this->config->exists('realm')) {
             throw new InvalidApplicationCredentialsException(
                 'You must define a realm'
             );
         }
         $realm = $this->config->get('realm');
 
-        $this->apiBaseUrl = $url . '/realms/' . $realm . '/protocol/openid-connect/';
+        $this->apiBaseUrl = $url.'/realms/'.$realm.'/protocol/openid-connect/';
 
-        $this->authorizeUrl = $this->apiBaseUrl . 'auth';
-        $this->accessTokenUrl = $this->apiBaseUrl . 'token';
+        $this->authorizeUrl = $this->apiBaseUrl.'auth';
+        $this->accessTokenUrl = $this->apiBaseUrl.'token';
 
     }
 
@@ -78,7 +78,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('sub')) {
+        if ( ! $data->exists('sub')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 

Indentation +68 added lines, -68 removed lines

@@ -31,72 +31,72 @@
 class Keycloak extends OAuth2
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public $scope = 'openid profile email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://www.keycloak.org/docs/latest/securing_apps/#_oidc';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        parent::configure();
-
-        if (!$this->config->exists('url')) {
-            throw new InvalidApplicationCredentialsException(
-                'You must define a provider url'
-            );
-        }
-        $url = $this->config->get('url');
-
-        if (!$this->config->exists('realm')) {
-            throw new InvalidApplicationCredentialsException(
-                'You must define a realm'
-            );
-        }
-        $realm = $this->config->get('realm');
-
-        $this->apiBaseUrl = $url . '/realms/' . $realm . '/protocol/openid-connect/';
-
-        $this->authorizeUrl = $this->apiBaseUrl . 'auth';
-        $this->accessTokenUrl = $this->apiBaseUrl . 'token';
-
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('userinfo');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('sub')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('sub');
-        $userProfile->displayName = $data->get('preferred_username');
-        $userProfile->email = $data->get('email');
-        $userProfile->firstName = $data->get('given_name');
-        $userProfile->lastName = $data->get('family_name');
-        $userProfile->emailVerified = $data->get('email_verified');
-
-        // Collect organization claim if provided in the IDToken
-        if ($data->exists('organization')) {
-            $kc_orgs = array_keys((array) $data->get('organization'));
-            $userProfile->data['organization'] = array_shift($kc_orgs); //Get the first key
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public $scope = 'openid profile email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://www.keycloak.org/docs/latest/securing_apps/#_oidc';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		parent::configure();
+
+		if (!$this->config->exists('url')) {
+			throw new InvalidApplicationCredentialsException(
+				'You must define a provider url'
+			);
+		}
+		$url = $this->config->get('url');
+
+		if (!$this->config->exists('realm')) {
+			throw new InvalidApplicationCredentialsException(
+				'You must define a realm'
+			);
+		}
+		$realm = $this->config->get('realm');
+
+		$this->apiBaseUrl = $url . '/realms/' . $realm . '/protocol/openid-connect/';
+
+		$this->authorizeUrl = $this->apiBaseUrl . 'auth';
+		$this->accessTokenUrl = $this->apiBaseUrl . 'token';
+
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('userinfo');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('sub')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('sub');
+		$userProfile->displayName = $data->get('preferred_username');
+		$userProfile->email = $data->get('email');
+		$userProfile->firstName = $data->get('given_name');
+		$userProfile->lastName = $data->get('family_name');
+		$userProfile->emailVerified = $data->get('email_verified');
+
+		// Collect organization claim if provided in the IDToken
+		if ($data->exists('organization')) {
+			$kc_orgs = array_keys((array) $data->get('organization'));
+			$userProfile->data['organization'] = array_shift($kc_orgs); //Get the first key
+		}
+
+		return $userProfile;
+	}
 }

src/Data/Collection.php

Indentation +139 added lines, -139 removed lines

@@ -12,143 +12,143 @@
  */
 final class Collection
 {
-    /**
-     * Data collection
-     *
-     * @var mixed
-     */
-    protected $collection = null;
-
-    /**
-     * @param mixed $data
-     */
-    public function __construct($data = null)
-    {
-        $this->collection = (object)$data;
-    }
-
-    /**
-     * Retrieves the whole collection as array
-     *
-     * @return mixed
-     */
-    public function toArray()
-    {
-        return (array)$this->collection;
-    }
-
-    /**
-     * Retrieves an item
-     *
-     * @param $property
-     *
-     * @return mixed
-     */
-    public function get($property)
-    {
-        if ($this->exists($property)) {
-            return $this->collection->$property;
-        }
-
-        return null;
-    }
-
-    /**
-     * Add or update an item
-     *
-     * @param $property
-     * @param mixed $value
-     */
-    public function set($property, $value)
-    {
-        if ($property) {
-            $this->collection->$property = $value;
-        }
-    }
-
-    /**
-     * .. until I come with a better name..
-     *
-     * @param $property
-     *
-     * @return Collection
-     */
-    public function filter($property)
-    {
-        if ($this->exists($property)) {
-            $data = $this->get($property);
-
-            if (!is_a($data, 'Collection')) {
-                $data = new Collection($data);
-            }
-
-            return $data;
-        }
-
-        return new Collection([]);
-    }
-
-    /**
-     * Checks whether an item within the collection
-     *
-     * @param $property
-     *
-     * @return bool
-     */
-    public function exists($property)
-    {
-        return property_exists($this->collection, $property);
-    }
-
-    /**
-     * Finds whether the collection is empty
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return !(bool)$this->count();
-    }
-
-    /**
-     * Count all items in collection
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->properties());
-    }
-
-    /**
-     * Returns all items properties names
-     *
-     * @return array
-     */
-    public function properties()
-    {
-        $properties = [];
-
-        foreach ($this->collection as $key => $value) {
-            $properties[] = $key;
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Returns all items values
-     *
-     * @return array
-     */
-    public function values()
-    {
-        $values = [];
-
-        foreach ($this->collection as $value) {
-            $values[] = $value;
-        }
-
-        return $values;
-    }
+	/**
+	 * Data collection
+	 *
+	 * @var mixed
+	 */
+	protected $collection = null;
+
+	/**
+	 * @param mixed $data
+	 */
+	public function __construct($data = null)
+	{
+		$this->collection = (object)$data;
+	}
+
+	/**
+	 * Retrieves the whole collection as array
+	 *
+	 * @return mixed
+	 */
+	public function toArray()
+	{
+		return (array)$this->collection;
+	}
+
+	/**
+	 * Retrieves an item
+	 *
+	 * @param $property
+	 *
+	 * @return mixed
+	 */
+	public function get($property)
+	{
+		if ($this->exists($property)) {
+			return $this->collection->$property;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Add or update an item
+	 *
+	 * @param $property
+	 * @param mixed $value
+	 */
+	public function set($property, $value)
+	{
+		if ($property) {
+			$this->collection->$property = $value;
+		}
+	}
+
+	/**
+	 * .. until I come with a better name..
+	 *
+	 * @param $property
+	 *
+	 * @return Collection
+	 */
+	public function filter($property)
+	{
+		if ($this->exists($property)) {
+			$data = $this->get($property);
+
+			if (!is_a($data, 'Collection')) {
+				$data = new Collection($data);
+			}
+
+			return $data;
+		}
+
+		return new Collection([]);
+	}
+
+	/**
+	 * Checks whether an item within the collection
+	 *
+	 * @param $property
+	 *
+	 * @return bool
+	 */
+	public function exists($property)
+	{
+		return property_exists($this->collection, $property);
+	}
+
+	/**
+	 * Finds whether the collection is empty
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+		return !(bool)$this->count();
+	}
+
+	/**
+	 * Count all items in collection
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->properties());
+	}
+
+	/**
+	 * Returns all items properties names
+	 *
+	 * @return array
+	 */
+	public function properties()
+	{
+		$properties = [];
+
+		foreach ($this->collection as $key => $value) {
+			$properties[] = $key;
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Returns all items values
+	 *
+	 * @return array
+	 */
+	public function values()
+	{
+		$values = [];
+
+		foreach ($this->collection as $value) {
+			$values[] = $value;
+		}
+
+		return $values;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function __construct($data = null)
     {
-        $this->collection = (object)$data;
+        $this->collection = (object) $data;
     }
 
     /**
@@ -34,7 +34,7 @@ 
      */
     public function toArray()
     {
-        return (array)$this->collection;
+        return (array) $this->collection;
     }
 
     /**
@@ -78,7 +78,7 @@ 
         if ($this->exists($property)) {
             $data = $this->get($property);
 
-            if (!is_a($data, 'Collection')) {
+            if ( ! is_a($data, 'Collection')) {
                 $data = new Collection($data);
             }
 
@@ -107,7 +107,7 @@ 
      */
     public function isEmpty()
     {
-        return !(bool)$this->count();
+        return ! (bool) $this->count();
     }
 
     /**

src/Provider/Spotify.php

Indentation +73 added lines, -73 removed lines

@@ -17,77 +17,77 @@
  */
 class Spotify extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'user-read-email';
-
-    /**
-     * {@inheritdoc}
-     */
-    public $apiBaseUrl = 'https://api.spotify.com/v1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    public $authorizeUrl = 'https://accounts.spotify.com/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://accounts.spotify.com/api/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.spotify.com/documentation/general/guides/authorization-guide/';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('display_name');
-        $userProfile->email = $data->get('email');
-        $userProfile->emailVerified = $data->get('email');
-        $userProfile->profileURL = $data->filter('external_urls')->get('spotify');
-        $userProfile->photoURL = $data->filter('images')->get('url');
-        $userProfile->country = $data->get('country');
-
-        if ($data->exists('birthdate')) {
-            $this->fetchBirthday($userProfile, $data->get('birthdate'));
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * Fetch use birthday
-     *
-     * @param User\Profile $userProfile
-     * @param              $birthday
-     *
-     * @return User\Profile
-     */
-    protected function fetchBirthday(User\Profile $userProfile, $birthday)
-    {
-        $result = (new Data\Parser())->parseBirthday($birthday);
-
-        $userProfile->birthDay = (int)$result[0];
-        $userProfile->birthMonth = (int)$result[1];
-        $userProfile->birthYear = (int)$result[2];
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'user-read-email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public $apiBaseUrl = 'https://api.spotify.com/v1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public $authorizeUrl = 'https://accounts.spotify.com/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://accounts.spotify.com/api/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.spotify.com/documentation/general/guides/authorization-guide/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('display_name');
+		$userProfile->email = $data->get('email');
+		$userProfile->emailVerified = $data->get('email');
+		$userProfile->profileURL = $data->filter('external_urls')->get('spotify');
+		$userProfile->photoURL = $data->filter('images')->get('url');
+		$userProfile->country = $data->get('country');
+
+		if ($data->exists('birthdate')) {
+			$this->fetchBirthday($userProfile, $data->get('birthdate'));
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * Fetch use birthday
+	 *
+	 * @param User\Profile $userProfile
+	 * @param              $birthday
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchBirthday(User\Profile $userProfile, $birthday)
+	{
+		$result = (new Data\Parser())->parseBirthday($birthday);
+
+		$userProfile->birthDay = (int)$result[0];
+		$userProfile->birthMonth = (int)$result[1];
+		$userProfile->birthYear = (int)$result[2];
+
+		return $userProfile;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -84,9 +84,9 @@ 
     {
         $result = (new Data\Parser())->parseBirthday($birthday);
 
-        $userProfile->birthDay = (int)$result[0];
-        $userProfile->birthMonth = (int)$result[1];
-        $userProfile->birthYear = (int)$result[2];
+        $userProfile->birthDay = (int) $result[0];
+        $userProfile->birthMonth = (int) $result[1];
+        $userProfile->birthYear = (int) $result[2];
 
         return $userProfile;
     }

src/Provider/Seznam.php

Indentation +43 added lines, -43 removed lines

@@ -17,47 +17,47 @@
  */
 class Seznam extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://login.szn.cz/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://login.szn.cz/api/v1/oauth/auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://login.szn.cz/api/v1/oauth/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://vyvojari.seznam.cz/oauth/doc';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('api/v1/user', 'GET', ['format' => 'json']);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('oauth_user_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('oauth_user_id');
-        $userProfile->email = $data->get('account_name');
-        $userProfile->firstName = $data->get('firstname');
-        $userProfile->lastName = $data->get('lastname');
-        $userProfile->photoURL = $data->get('avatar_url');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://login.szn.cz/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://login.szn.cz/api/v1/oauth/auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://login.szn.cz/api/v1/oauth/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://vyvojari.seznam.cz/oauth/doc';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('api/v1/user', 'GET', ['format' => 'json']);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('oauth_user_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('oauth_user_id');
+		$userProfile->email = $data->get('account_name');
+		$userProfile->firstName = $data->get('firstname');
+		$userProfile->lastName = $data->get('lastname');
+		$userProfile->photoURL = $data->get('avatar_url');
+
+		return $userProfile;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

src/Adapter/OpenID.php

Indentation +257 added lines, -257 removed lines

@@ -23,261 +23,261 @@
  */
 abstract class OpenID extends AbstractAdapter implements AdapterInterface
 {
-    /**
-     * LightOpenID instance
-     *
-     * @var object
-     */
-    protected $openIdClient = null;
-
-    /**
-     * Openid provider identifier
-     *
-     * @var string
-     */
-    protected $openidIdentifier = '';
-
-    /**
-     * IPD API Documentation
-     *
-     * OPTIONAL.
-     *
-     * @var string
-     */
-    protected $apiDocumentation = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        if ($this->config->exists('openid_identifier')) {
-            $this->openidIdentifier = $this->config->get('openid_identifier');
-        }
-
-        if (empty($this->openidIdentifier)) {
-            throw new InvalidOpenidIdentifierException('OpenID adapter requires an openid_identifier.', 4);
-        }
-
-        $this->setCallback($this->config->get('callback'));
-        $this->setApiEndpoints($this->config->get('endpoints'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        $hostPort = parse_url($this->callback, PHP_URL_PORT);
-        $hostUrl = parse_url($this->callback, PHP_URL_HOST);
-
-        if ($hostPort) {
-            $hostUrl .= ':' . $hostPort;
-        }
-
-        // @fixme: add proxy
-        $this->openIdClient = new LightOpenID($hostUrl, null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate()
-    {
-        $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-
-        if ($this->isConnected()) {
-            return true;
-        }
-
-        if (empty($_REQUEST['openid_mode'])) {
-            $this->authenticateBegin();
-        } else {
-            return $this->authenticateFinish();
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        return (bool)$this->storage->get($this->providerId . '.user');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function disconnect()
-    {
-        $this->storage->delete($this->providerId . '.user');
-
-        return true;
-    }
-
-    /**
-     * Initiate the authorization protocol
-     *
-     * Include and instantiate LightOpenID
-     */
-    protected function authenticateBegin()
-    {
-        $this->openIdClient->identity = $this->openidIdentifier;
-        $this->openIdClient->returnUrl = $this->callback;
-        $this->openIdClient->required = [
-            'namePerson/first',
-            'namePerson/last',
-            'namePerson/friendly',
-            'namePerson',
-            'contact/email',
-            'birthDate',
-            'birthDate/birthDay',
-            'birthDate/birthMonth',
-            'birthDate/birthYear',
-            'person/gender',
-            'pref/language',
-            'contact/postalCode/home',
-            'contact/city/home',
-            'contact/country/home',
-
-            'media/image/default',
-        ];
-
-        $authUrl = $this->openIdClient->authUrl();
-
-        $this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
-
-        HttpClient\Util::redirect($authUrl);
-    }
-
-    /**
-     * Finalize the authorization process.
-     *
-     * @throws AuthorizationDeniedException
-     * @throws UnexpectedApiResponseException
-     */
-    protected function authenticateFinish()
-    {
-        $this->logger->debug(
-            sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
-            [HttpClient\Util::getCurrentUrl(true)]
-        );
-
-        if ($this->openIdClient->mode == 'cancel') {
-            throw new AuthorizationDeniedException('User has cancelled the authentication.');
-        }
-
-        if (!$this->openIdClient->validate()) {
-            throw new UnexpectedApiResponseException('Invalid response received.');
-        }
-
-        $openidAttributes = $this->openIdClient->getAttributes();
-
-        if (!$this->openIdClient->identity) {
-            throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
-        }
-
-        $userProfile = $this->fetchUserProfile($openidAttributes);
-
-        /* with openid providers we only get user profiles once, so we store it */
-        $this->storage->set($this->providerId . '.user', $userProfile);
-    }
-
-    /**
-     * Fetch user profile from received openid attributes
-     *
-     * @param array $openidAttributes
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserProfile($openidAttributes)
-    {
-        $data = new Data\Collection($openidAttributes);
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $this->openIdClient->identity;
-
-        $userProfile->firstName = $data->get('namePerson/first');
-        $userProfile->lastName = $data->get('namePerson/last');
-        $userProfile->email = $data->get('contact/email');
-        $userProfile->language = $data->get('pref/language');
-        $userProfile->country = $data->get('contact/country/home');
-        $userProfile->zip = $data->get('contact/postalCode/home');
-        $userProfile->gender = $data->get('person/gender');
-        $userProfile->photoURL = $data->get('media/image/default');
-        $userProfile->birthDay = $data->get('birthDate/birthDay');
-        $userProfile->birthMonth = $data->get('birthDate/birthMonth');
-        $userProfile->birthYear = $data->get('birthDate/birthDate');
-
-        $userProfile = $this->fetchUserGender($userProfile, $data->get('person/gender'));
-
-        $userProfile = $this->fetchUserDisplayName($userProfile, $data);
-
-        return $userProfile;
-    }
-
-    /**
-     * Extract users display names
-     *
-     * @param User\Profile $userProfile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserDisplayName(User\Profile $userProfile, Data\Collection $data)
-    {
-        $userProfile->displayName = $data->get('namePerson');
-
-        $userProfile->displayName = $userProfile->displayName
-            ? $userProfile->displayName
-            : $data->get('namePerson/friendly');
-
-        $userProfile->displayName = $userProfile->displayName
-            ? $userProfile->displayName
-            : trim($userProfile->firstName . ' ' . $userProfile->lastName);
-
-        return $userProfile;
-    }
-
-    /**
-     * Extract users gender
-     *
-     * @param User\Profile $userProfile
-     * @param string $gender
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserGender(User\Profile $userProfile, $gender)
-    {
-        $gender = strtolower((string)$gender);
-
-        if ('f' == $gender) {
-            $gender = 'female';
-        }
-
-        if ('m' == $gender) {
-            $gender = 'male';
-        }
-
-        $userProfile->gender = $gender;
-
-        return $userProfile;
-    }
-
-    /**
-     * OpenID only provide the user profile one. This method will attempt to retrieve the profile from storage.
-     */
-    public function getUserProfile()
-    {
-        $userProfile = $this->storage->get($this->providerId . '.user');
-
-        if (!is_object($userProfile)) {
-            throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * LightOpenID instance
+	 *
+	 * @var object
+	 */
+	protected $openIdClient = null;
+
+	/**
+	 * Openid provider identifier
+	 *
+	 * @var string
+	 */
+	protected $openidIdentifier = '';
+
+	/**
+	 * IPD API Documentation
+	 *
+	 * OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $apiDocumentation = '';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		if ($this->config->exists('openid_identifier')) {
+			$this->openidIdentifier = $this->config->get('openid_identifier');
+		}
+
+		if (empty($this->openidIdentifier)) {
+			throw new InvalidOpenidIdentifierException('OpenID adapter requires an openid_identifier.', 4);
+		}
+
+		$this->setCallback($this->config->get('callback'));
+		$this->setApiEndpoints($this->config->get('endpoints'));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		$hostPort = parse_url($this->callback, PHP_URL_PORT);
+		$hostUrl = parse_url($this->callback, PHP_URL_HOST);
+
+		if ($hostPort) {
+			$hostUrl .= ':' . $hostPort;
+		}
+
+		// @fixme: add proxy
+		$this->openIdClient = new LightOpenID($hostUrl, null);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticate()
+	{
+		$this->logger->info(sprintf('%s::authenticate()', get_class($this)));
+
+		if ($this->isConnected()) {
+			return true;
+		}
+
+		if (empty($_REQUEST['openid_mode'])) {
+			$this->authenticateBegin();
+		} else {
+			return $this->authenticateFinish();
+		}
+
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConnected()
+	{
+		return (bool)$this->storage->get($this->providerId . '.user');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function disconnect()
+	{
+		$this->storage->delete($this->providerId . '.user');
+
+		return true;
+	}
+
+	/**
+	 * Initiate the authorization protocol
+	 *
+	 * Include and instantiate LightOpenID
+	 */
+	protected function authenticateBegin()
+	{
+		$this->openIdClient->identity = $this->openidIdentifier;
+		$this->openIdClient->returnUrl = $this->callback;
+		$this->openIdClient->required = [
+			'namePerson/first',
+			'namePerson/last',
+			'namePerson/friendly',
+			'namePerson',
+			'contact/email',
+			'birthDate',
+			'birthDate/birthDay',
+			'birthDate/birthMonth',
+			'birthDate/birthYear',
+			'person/gender',
+			'pref/language',
+			'contact/postalCode/home',
+			'contact/city/home',
+			'contact/country/home',
+
+			'media/image/default',
+		];
+
+		$authUrl = $this->openIdClient->authUrl();
+
+		$this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
+
+		HttpClient\Util::redirect($authUrl);
+	}
+
+	/**
+	 * Finalize the authorization process.
+	 *
+	 * @throws AuthorizationDeniedException
+	 * @throws UnexpectedApiResponseException
+	 */
+	protected function authenticateFinish()
+	{
+		$this->logger->debug(
+			sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
+			[HttpClient\Util::getCurrentUrl(true)]
+		);
+
+		if ($this->openIdClient->mode == 'cancel') {
+			throw new AuthorizationDeniedException('User has cancelled the authentication.');
+		}
+
+		if (!$this->openIdClient->validate()) {
+			throw new UnexpectedApiResponseException('Invalid response received.');
+		}
+
+		$openidAttributes = $this->openIdClient->getAttributes();
+
+		if (!$this->openIdClient->identity) {
+			throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
+		}
+
+		$userProfile = $this->fetchUserProfile($openidAttributes);
+
+		/* with openid providers we only get user profiles once, so we store it */
+		$this->storage->set($this->providerId . '.user', $userProfile);
+	}
+
+	/**
+	 * Fetch user profile from received openid attributes
+	 *
+	 * @param array $openidAttributes
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserProfile($openidAttributes)
+	{
+		$data = new Data\Collection($openidAttributes);
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $this->openIdClient->identity;
+
+		$userProfile->firstName = $data->get('namePerson/first');
+		$userProfile->lastName = $data->get('namePerson/last');
+		$userProfile->email = $data->get('contact/email');
+		$userProfile->language = $data->get('pref/language');
+		$userProfile->country = $data->get('contact/country/home');
+		$userProfile->zip = $data->get('contact/postalCode/home');
+		$userProfile->gender = $data->get('person/gender');
+		$userProfile->photoURL = $data->get('media/image/default');
+		$userProfile->birthDay = $data->get('birthDate/birthDay');
+		$userProfile->birthMonth = $data->get('birthDate/birthMonth');
+		$userProfile->birthYear = $data->get('birthDate/birthDate');
+
+		$userProfile = $this->fetchUserGender($userProfile, $data->get('person/gender'));
+
+		$userProfile = $this->fetchUserDisplayName($userProfile, $data);
+
+		return $userProfile;
+	}
+
+	/**
+	 * Extract users display names
+	 *
+	 * @param User\Profile $userProfile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserDisplayName(User\Profile $userProfile, Data\Collection $data)
+	{
+		$userProfile->displayName = $data->get('namePerson');
+
+		$userProfile->displayName = $userProfile->displayName
+			? $userProfile->displayName
+			: $data->get('namePerson/friendly');
+
+		$userProfile->displayName = $userProfile->displayName
+			? $userProfile->displayName
+			: trim($userProfile->firstName . ' ' . $userProfile->lastName);
+
+		return $userProfile;
+	}
+
+	/**
+	 * Extract users gender
+	 *
+	 * @param User\Profile $userProfile
+	 * @param string $gender
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserGender(User\Profile $userProfile, $gender)
+	{
+		$gender = strtolower((string)$gender);
+
+		if ('f' == $gender) {
+			$gender = 'female';
+		}
+
+		if ('m' == $gender) {
+			$gender = 'male';
+		}
+
+		$userProfile->gender = $gender;
+
+		return $userProfile;
+	}
+
+	/**
+	 * OpenID only provide the user profile one. This method will attempt to retrieve the profile from storage.
+	 */
+	public function getUserProfile()
+	{
+		$userProfile = $this->storage->get($this->providerId . '.user');
+
+		if (!is_object($userProfile)) {
+			throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
+		}
+
+		return $userProfile;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
         $hostUrl = parse_url($this->callback, PHP_URL_HOST);
 
         if ($hostPort) {
-            $hostUrl .= ':' . $hostPort;
+            $hostUrl .= ':'.$hostPort;
         }
 
         // @fixme: add proxy
@@ -104,7 +104,7 @@ 
      */
     public function isConnected()
     {
-        return (bool)$this->storage->get($this->providerId . '.user');
+        return (bool) $this->storage->get($this->providerId.'.user');
     }
 
     /**
@@ -112,7 +112,7 @@ 
      */
     public function disconnect()
     {
-        $this->storage->delete($this->providerId . '.user');
+        $this->storage->delete($this->providerId.'.user');
 
         return true;
     }
@@ -169,20 +169,20 @@ 
             throw new AuthorizationDeniedException('User has cancelled the authentication.');
         }
 
-        if (!$this->openIdClient->validate()) {
+        if ( ! $this->openIdClient->validate()) {
             throw new UnexpectedApiResponseException('Invalid response received.');
         }
 
         $openidAttributes = $this->openIdClient->getAttributes();
 
-        if (!$this->openIdClient->identity) {
+        if ( ! $this->openIdClient->identity) {
             throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
         }
 
         $userProfile = $this->fetchUserProfile($openidAttributes);
 
         /* with openid providers we only get user profiles once, so we store it */
-        $this->storage->set($this->providerId . '.user', $userProfile);
+        $this->storage->set($this->providerId.'.user', $userProfile);
     }
 
     /**
@@ -237,7 +237,7 @@ 
 
         $userProfile->displayName = $userProfile->displayName
             ? $userProfile->displayName
-            : trim($userProfile->firstName . ' ' . $userProfile->lastName);
+            : trim($userProfile->firstName.' '.$userProfile->lastName);
 
         return $userProfile;
     }
@@ -252,7 +252,7 @@ 
      */
     protected function fetchUserGender(User\Profile $userProfile, $gender)
     {
-        $gender = strtolower((string)$gender);
+        $gender = strtolower((string) $gender);
 
         if ('f' == $gender) {
             $gender = 'female';
@@ -272,9 +272,9 @@ 
      */
     public function getUserProfile()
     {
-        $userProfile = $this->storage->get($this->providerId . '.user');
+        $userProfile = $this->storage->get($this->providerId.'.user');
 
-        if (!is_object($userProfile)) {
+        if ( ! is_object($userProfile)) {
             throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
         }
 

src/Provider/Mastodon.php

Indentation +110 added lines, -110 removed lines

@@ -10,114 +10,114 @@
 
 class Mastodon extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $scope = 'read';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://docs.joinmastodon.org/spec/oauth/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        parent::configure();
-
-        if (!$this->config->exists('url')) {
-            throw new InvalidApplicationCredentialsException(
-                'You must define a Mastodon instance url'
-            );
-        }
-        $url = $this->config->get('url');
-
-        $this->apiBaseUrl = $url . '/api/v1';
-
-        $this->authorizeUrl = $url . '/oauth/authorize';
-        $this->accessTokenUrl = $url . '/oauth/token';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('accounts/verify_credentials', 'GET', []);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id') || !$data->get('id')) {
-            throw new UnexpectedApiResponseException(
-                'Provider API returned an unexpected response.'
-            );
-        }
-
-        $userProfile = new Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('username');
-        $userProfile->photoURL =
-            $data->get('avatar') ?: $data->get('avatar_static');
-        $userProfile->webSiteURL = $data->get('url');
-        $userProfile->description = $data->get('note');
-        $userProfile->firstName = $data->get('display_name');
-
-        return $userProfile;
-    }
-
-    public function setUserStatus($status)
-    {
-        // Prepare request parameters.
-        $params = [];
-        if (isset($status['message'])) {
-            $params['status'] = $status['message'];
-        }
-
-        if (isset($status['picture'])) {
-            $headers = [
-                'Content-Type' => 'multipart/form-data',
-            ];
-
-            $pictures = $status['picture'];
-
-            $ids = [];
-
-            foreach ($pictures as $picture) {
-                $images = $this->apiRequest(
-                    $this->config->get('url') . '/api/v2/media',
-                    'POST',
-                    [
-                        'file' => new \CurlFile(
-                            $picture,
-                            'image/jpg',
-                            'filename'
-                        ),
-                    ],
-                    $headers,
-                    true
-                );
-
-                $ids[] = $images->id;
-            }
-
-            $params['media_ids'] = $ids;
-        }
-
-        $headers = [
-            'Content-Type' => 'application/json',
-        ];
-
-        $response = $this->apiRequest(
-            'statuses',
-            'POST',
-            $params,
-            $headers,
-            false
-        );
-
-        return $response;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public $scope = 'read';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://docs.joinmastodon.org/spec/oauth/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		parent::configure();
+
+		if (!$this->config->exists('url')) {
+			throw new InvalidApplicationCredentialsException(
+				'You must define a Mastodon instance url'
+			);
+		}
+		$url = $this->config->get('url');
+
+		$this->apiBaseUrl = $url . '/api/v1';
+
+		$this->authorizeUrl = $url . '/oauth/authorize';
+		$this->accessTokenUrl = $url . '/oauth/token';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('accounts/verify_credentials', 'GET', []);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id') || !$data->get('id')) {
+			throw new UnexpectedApiResponseException(
+				'Provider API returned an unexpected response.'
+			);
+		}
+
+		$userProfile = new Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('username');
+		$userProfile->photoURL =
+			$data->get('avatar') ?: $data->get('avatar_static');
+		$userProfile->webSiteURL = $data->get('url');
+		$userProfile->description = $data->get('note');
+		$userProfile->firstName = $data->get('display_name');
+
+		return $userProfile;
+	}
+
+	public function setUserStatus($status)
+	{
+		// Prepare request parameters.
+		$params = [];
+		if (isset($status['message'])) {
+			$params['status'] = $status['message'];
+		}
+
+		if (isset($status['picture'])) {
+			$headers = [
+				'Content-Type' => 'multipart/form-data',
+			];
+
+			$pictures = $status['picture'];
+
+			$ids = [];
+
+			foreach ($pictures as $picture) {
+				$images = $this->apiRequest(
+					$this->config->get('url') . '/api/v2/media',
+					'POST',
+					[
+						'file' => new \CurlFile(
+							$picture,
+							'image/jpg',
+							'filename'
+						),
+					],
+					$headers,
+					true
+				);
+
+				$ids[] = $images->id;
+			}
+
+			$params['media_ids'] = $ids;
+		}
+
+		$headers = [
+			'Content-Type' => 'application/json',
+		];
+
+		$response = $this->apiRequest(
+			'statuses',
+			'POST',
+			$params,
+			$headers,
+			false
+		);
+
+		return $response;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -27,17 +27,17 @@ 
     {
         parent::configure();
 
-        if (!$this->config->exists('url')) {
+        if ( ! $this->config->exists('url')) {
             throw new InvalidApplicationCredentialsException(
                 'You must define a Mastodon instance url'
             );
         }
         $url = $this->config->get('url');
 
-        $this->apiBaseUrl = $url . '/api/v1';
+        $this->apiBaseUrl = $url.'/api/v1';
 
-        $this->authorizeUrl = $url . '/oauth/authorize';
-        $this->accessTokenUrl = $url . '/oauth/token';
+        $this->authorizeUrl = $url.'/oauth/authorize';
+        $this->accessTokenUrl = $url.'/oauth/token';
     }
 
     /**
@@ -49,7 +49,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id') || !$data->get('id')) {
+        if ( ! $data->exists('id') || ! $data->get('id')) {
             throw new UnexpectedApiResponseException(
                 'Provider API returned an unexpected response.'
             );
@@ -87,7 +87,7 @@ 
 
             foreach ($pictures as $picture) {
                 $images = $this->apiRequest(
-                    $this->config->get('url') . '/api/v2/media',
+                    $this->config->get('url').'/api/v2/media',
                     'POST',
                     [
                         'file' => new \CurlFile(

src/Provider/Apple.php

Indentation +274 added lines, -274 removed lines

@@ -64,278 +64,278 @@
  */
 class Apple extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'name email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://appleid.apple.com/auth/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://appleid.apple.com/auth/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://appleid.apple.com/auth/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.apple.com/documentation/sign_in_with_apple';
-
-    /**
-     * {@inheritdoc}
-     * The Sign in with Apple servers require percent encoding (or URL encoding)
-     * for its query parameters. If you are using the Sign in with Apple REST API,
-     * you must provide values with encoded spaces (`%20`) instead of plus (`+`) signs.
-     */
-    protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC3986;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-        $this->AuthorizeUrlParameters['response_mode'] = 'form_post';
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     * @throws InvalidApplicationCredentialsException
-     */
-    protected function configure()
-    {
-        $keys = $this->config->get('keys');
-        $keys['secret'] = $this->getSecret();
-        $this->config->set('keys', $keys);
-        parent::configure();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * include id_token $tokenNames
-     */
-    public function getAccessToken()
-    {
-        $tokenNames = [
-            'access_token',
-            'id_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}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        $this->storeData('id_token', $collection->get('id_token'));
-
-        return $collection;
-    }
-
-    /**
-     * Get the user profile
-     *
-     * @throws HttpClientFailureException
-     * @throws InvalidAccessTokenException
-     * @throws UnexpectedValueException
-     * @throws HttpRequestFailedException
-     * @throws Exception
-     */
-    public function getUserProfile()
-    {
-        $id_token = $this->getStoredData('id_token');
-
-        $verifyTokenSignature =
-            $this->config->exists('verifyTokenSignature') ? $this->config->get('verifyTokenSignature') : true;
-
-        if (!$verifyTokenSignature) {
-            // payload extraction by https://github.com/omidborjian
-            // https://github.com/hybridauth/hybridauth/issues/1095#issuecomment-626479263
-            // JWT splits the string to 3 components 1) first is header 2) is payload 3) is signature
-            $payload = explode('.', $id_token)[1];
-            $payload = json_decode(base64_decode($payload));
-        } else {
-            // validate the token signature and get the payload
-            $publicKeys = $this->apiRequest('keys');
-
-            JWT::$leeway = 120;
-
-            $error = false;
-            $payload = null;
-
-            foreach ($publicKeys->keys as $publicKey) {
-                try {
-                    $jwk = (array)$publicKey;
-
-                    $key = PublicKeyLoader::load(
-                        [
-                            'e' => new BigInteger(base64_decode($jwk['e']), 256),
-                            'n' => new BigInteger(base64_decode(strtr($jwk['n'], '-_', '+/'), true), 256)
-                        ]
-                    )
-                        ->withHash('sha1')
-                        ->withMGFHash('sha1');
-
-                    $pem = (string)$key;
-
-                    $payload = (version_compare($this->getJwtVersion(), '6.2') < 0) ?
-                        JWT::decode($id_token, $pem, ['RS256']) :
-                        JWT::decode($id_token, new Key($pem, 'RS256'));
-                    break;
-                } catch (Exception $e) {
-                    $error = $e->getMessage();
-                    if ($e instanceof ExpiredException) {
-                        break;
-                    }
-                }
-            }
-
-            if ($error && !$payload) {
-                throw new Exception($error);
-            }
-        }
-
-        $data = new Data\Collection($payload);
-
-        if (!$data->exists('sub')) {
-            throw new UnexpectedValueException('Missing token payload.');
-        }
-
-        $userProfile = new User\Profile();
-        $userProfile->identifier = $data->get('sub');
-        $userProfile->email = $data->get('email');
-        $this->storeData('expires_at', $data->get('exp'));
-
-        if (!empty($_REQUEST['user'])) {
-            $objUser = json_decode($_REQUEST['user']);
-            $user = new Data\Collection($objUser);
-            if (!$user->isEmpty()) {
-                $name = $user->get('name');
-                if (!empty($name->firstName)) {
-                    $userProfile->firstName = $name->firstName;
-                    $userProfile->lastName = $name->lastName;
-                    $userProfile->displayName = join(' ', [$userProfile->firstName, $userProfile->lastName]);
-                }
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * Get the Apple secret as a JWT token
-     *
-     * @return string secret token
-     * @throws InvalidApplicationCredentialsException
-     */
-    private function getSecret()
-    {
-        // Your 10-character Team ID
-        $team_id = $this->config->filter('keys')->get('team_id');
-
-        if (!$team_id) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter team_id: your team id is required to generate the JWS token.'
-            );
-        }
-
-        // Your Services ID, e.g. com.aaronparecki.services
-        $client_id = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
-
-        if (!$client_id) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter id: your client id is required to generate the JWS token.'
-            );
-        }
-
-        // Find the 10-char Key ID value from the portal
-        $key_id = $this->config->filter('keys')->get('key_id');
-
-        if (!$key_id) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter key_id: your key id is required to generate the JWS token.'
-            );
-        }
-
-        // Find the 10-char Key ID value from the portal
-        $key_content = $this->config->filter('keys')->get('key_content');
-
-        // Save your private key from Apple in a file called `key.txt`
-        if (!$key_content) {
-            $key_file = $this->config->filter('keys')->get('key_file');
-
-            if (!$key_file) {
-                throw new InvalidApplicationCredentialsException(
-                    'Missing parameter key_content or key_file: your key is required to generate the JWS token.'
-                );
-            }
-
-            if (!file_exists($key_file)) {
-                throw new InvalidApplicationCredentialsException(
-                    "Your key file $key_file does not exist."
-                );
-            }
-
-            $key_content = file_get_contents($key_file);
-        }
-
-        $data = [
-            'iat' => time(),
-            'exp' => time() + 86400 * 180,
-            'iss' => $team_id,
-            'aud' => 'https://appleid.apple.com',
-            'sub' => $client_id
-        ];
-
-        return JWT::encode($data, $key_content, 'ES256', $key_id);
-    }
-
-    /**
-     * Try to get the installed JWT version
-     *
-     * If composer 2 is installed use InstalledVersions::getVersion,
-     * otherwise return an empty string because no version check is available
-     *
-     * @return string|null
-     */
-    private function getJwtVersion()
-    {
-        // assume old JWT version if no version check is possible because composer 1 is installed
-        return class_exists('Composer\InstalledVersions') ?
-            InstalledVersions::getVersion('firebase/php-jwt') :
-            '';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'name email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://appleid.apple.com/auth/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://appleid.apple.com/auth/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://appleid.apple.com/auth/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.apple.com/documentation/sign_in_with_apple';
+
+	/**
+	 * {@inheritdoc}
+	 * The Sign in with Apple servers require percent encoding (or URL encoding)
+	 * for its query parameters. If you are using the Sign in with Apple REST API,
+	 * you must provide values with encoded spaces (`%20`) instead of plus (`+`) signs.
+	 */
+	protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC3986;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+		$this->AuthorizeUrlParameters['response_mode'] = 'form_post';
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 * @throws InvalidApplicationCredentialsException
+	 */
+	protected function configure()
+	{
+		$keys = $this->config->get('keys');
+		$keys['secret'] = $this->getSecret();
+		$this->config->set('keys', $keys);
+		parent::configure();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * include id_token $tokenNames
+	 */
+	public function getAccessToken()
+	{
+		$tokenNames = [
+			'access_token',
+			'id_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}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		$this->storeData('id_token', $collection->get('id_token'));
+
+		return $collection;
+	}
+
+	/**
+	 * Get the user profile
+	 *
+	 * @throws HttpClientFailureException
+	 * @throws InvalidAccessTokenException
+	 * @throws UnexpectedValueException
+	 * @throws HttpRequestFailedException
+	 * @throws Exception
+	 */
+	public function getUserProfile()
+	{
+		$id_token = $this->getStoredData('id_token');
+
+		$verifyTokenSignature =
+			$this->config->exists('verifyTokenSignature') ? $this->config->get('verifyTokenSignature') : true;
+
+		if (!$verifyTokenSignature) {
+			// payload extraction by https://github.com/omidborjian
+			// https://github.com/hybridauth/hybridauth/issues/1095#issuecomment-626479263
+			// JWT splits the string to 3 components 1) first is header 2) is payload 3) is signature
+			$payload = explode('.', $id_token)[1];
+			$payload = json_decode(base64_decode($payload));
+		} else {
+			// validate the token signature and get the payload
+			$publicKeys = $this->apiRequest('keys');
+
+			JWT::$leeway = 120;
+
+			$error = false;
+			$payload = null;
+
+			foreach ($publicKeys->keys as $publicKey) {
+				try {
+					$jwk = (array)$publicKey;
+
+					$key = PublicKeyLoader::load(
+						[
+							'e' => new BigInteger(base64_decode($jwk['e']), 256),
+							'n' => new BigInteger(base64_decode(strtr($jwk['n'], '-_', '+/'), true), 256)
+						]
+					)
+						->withHash('sha1')
+						->withMGFHash('sha1');
+
+					$pem = (string)$key;
+
+					$payload = (version_compare($this->getJwtVersion(), '6.2') < 0) ?
+						JWT::decode($id_token, $pem, ['RS256']) :
+						JWT::decode($id_token, new Key($pem, 'RS256'));
+					break;
+				} catch (Exception $e) {
+					$error = $e->getMessage();
+					if ($e instanceof ExpiredException) {
+						break;
+					}
+				}
+			}
+
+			if ($error && !$payload) {
+				throw new Exception($error);
+			}
+		}
+
+		$data = new Data\Collection($payload);
+
+		if (!$data->exists('sub')) {
+			throw new UnexpectedValueException('Missing token payload.');
+		}
+
+		$userProfile = new User\Profile();
+		$userProfile->identifier = $data->get('sub');
+		$userProfile->email = $data->get('email');
+		$this->storeData('expires_at', $data->get('exp'));
+
+		if (!empty($_REQUEST['user'])) {
+			$objUser = json_decode($_REQUEST['user']);
+			$user = new Data\Collection($objUser);
+			if (!$user->isEmpty()) {
+				$name = $user->get('name');
+				if (!empty($name->firstName)) {
+					$userProfile->firstName = $name->firstName;
+					$userProfile->lastName = $name->lastName;
+					$userProfile->displayName = join(' ', [$userProfile->firstName, $userProfile->lastName]);
+				}
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * Get the Apple secret as a JWT token
+	 *
+	 * @return string secret token
+	 * @throws InvalidApplicationCredentialsException
+	 */
+	private function getSecret()
+	{
+		// Your 10-character Team ID
+		$team_id = $this->config->filter('keys')->get('team_id');
+
+		if (!$team_id) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter team_id: your team id is required to generate the JWS token.'
+			);
+		}
+
+		// Your Services ID, e.g. com.aaronparecki.services
+		$client_id = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
+
+		if (!$client_id) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter id: your client id is required to generate the JWS token.'
+			);
+		}
+
+		// Find the 10-char Key ID value from the portal
+		$key_id = $this->config->filter('keys')->get('key_id');
+
+		if (!$key_id) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter key_id: your key id is required to generate the JWS token.'
+			);
+		}
+
+		// Find the 10-char Key ID value from the portal
+		$key_content = $this->config->filter('keys')->get('key_content');
+
+		// Save your private key from Apple in a file called `key.txt`
+		if (!$key_content) {
+			$key_file = $this->config->filter('keys')->get('key_file');
+
+			if (!$key_file) {
+				throw new InvalidApplicationCredentialsException(
+					'Missing parameter key_content or key_file: your key is required to generate the JWS token.'
+				);
+			}
+
+			if (!file_exists($key_file)) {
+				throw new InvalidApplicationCredentialsException(
+					"Your key file $key_file does not exist."
+				);
+			}
+
+			$key_content = file_get_contents($key_file);
+		}
+
+		$data = [
+			'iat' => time(),
+			'exp' => time() + 86400 * 180,
+			'iss' => $team_id,
+			'aud' => 'https://appleid.apple.com',
+			'sub' => $client_id
+		];
+
+		return JWT::encode($data, $key_content, 'ES256', $key_id);
+	}
+
+	/**
+	 * Try to get the installed JWT version
+	 *
+	 * If composer 2 is installed use InstalledVersions::getVersion,
+	 * otherwise return an empty string because no version check is available
+	 *
+	 * @return string|null
+	 */
+	private function getJwtVersion()
+	{
+		// assume old JWT version if no version check is possible because composer 1 is installed
+		return class_exists('Composer\InstalledVersions') ?
+			InstalledVersions::getVersion('firebase/php-jwt') :
+			'';
+	}
 }

Spacing +16 added lines, -18 removed lines

@@ -181,7 +181,7 @@ 
         $verifyTokenSignature =
             $this->config->exists('verifyTokenSignature') ? $this->config->get('verifyTokenSignature') : true;
 
-        if (!$verifyTokenSignature) {
+        if ( ! $verifyTokenSignature) {
             // payload extraction by https://github.com/omidborjian
             // https://github.com/hybridauth/hybridauth/issues/1095#issuecomment-626479263
             // JWT splits the string to 3 components 1) first is header 2) is payload 3) is signature
@@ -198,7 +198,7 @@ 
 
             foreach ($publicKeys->keys as $publicKey) {
                 try {
-                    $jwk = (array)$publicKey;
+                    $jwk = (array) $publicKey;
 
                     $key = PublicKeyLoader::load(
                         [
@@ -209,11 +209,10 @@ 
                         ->withHash('sha1')
                         ->withMGFHash('sha1');
 
-                    $pem = (string)$key;
+                    $pem = (string) $key;
 
                     $payload = (version_compare($this->getJwtVersion(), '6.2') < 0) ?
-                        JWT::decode($id_token, $pem, ['RS256']) :
-                        JWT::decode($id_token, new Key($pem, 'RS256'));
+                        JWT::decode($id_token, $pem, ['RS256']) : JWT::decode($id_token, new Key($pem, 'RS256'));
                     break;
                 } catch (Exception $e) {
                     $error = $e->getMessage();
@@ -223,14 +222,14 @@ 
                 }
             }
 
-            if ($error && !$payload) {
+            if ($error && ! $payload) {
                 throw new Exception($error);
             }
         }
 
         $data = new Data\Collection($payload);
 
-        if (!$data->exists('sub')) {
+        if ( ! $data->exists('sub')) {
             throw new UnexpectedValueException('Missing token payload.');
         }
 
@@ -239,12 +238,12 @@ 
         $userProfile->email = $data->get('email');
         $this->storeData('expires_at', $data->get('exp'));
 
-        if (!empty($_REQUEST['user'])) {
+        if ( ! empty($_REQUEST['user'])) {
             $objUser = json_decode($_REQUEST['user']);
             $user = new Data\Collection($objUser);
-            if (!$user->isEmpty()) {
+            if ( ! $user->isEmpty()) {
                 $name = $user->get('name');
-                if (!empty($name->firstName)) {
+                if ( ! empty($name->firstName)) {
                     $userProfile->firstName = $name->firstName;
                     $userProfile->lastName = $name->lastName;
                     $userProfile->displayName = join(' ', [$userProfile->firstName, $userProfile->lastName]);
@@ -266,7 +265,7 @@ 
         // Your 10-character Team ID
         $team_id = $this->config->filter('keys')->get('team_id');
 
-        if (!$team_id) {
+        if ( ! $team_id) {
             throw new InvalidApplicationCredentialsException(
                 'Missing parameter team_id: your team id is required to generate the JWS token.'
             );
@@ -275,7 +274,7 @@ 
         // Your Services ID, e.g. com.aaronparecki.services
         $client_id = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
 
-        if (!$client_id) {
+        if ( ! $client_id) {
             throw new InvalidApplicationCredentialsException(
                 'Missing parameter id: your client id is required to generate the JWS token.'
             );
@@ -284,7 +283,7 @@ 
         // Find the 10-char Key ID value from the portal
         $key_id = $this->config->filter('keys')->get('key_id');
 
-        if (!$key_id) {
+        if ( ! $key_id) {
             throw new InvalidApplicationCredentialsException(
                 'Missing parameter key_id: your key id is required to generate the JWS token.'
             );
@@ -294,16 +293,16 @@ 
         $key_content = $this->config->filter('keys')->get('key_content');
 
         // Save your private key from Apple in a file called `key.txt`
-        if (!$key_content) {
+        if ( ! $key_content) {
             $key_file = $this->config->filter('keys')->get('key_file');
 
-            if (!$key_file) {
+            if ( ! $key_file) {
                 throw new InvalidApplicationCredentialsException(
                     'Missing parameter key_content or key_file: your key is required to generate the JWS token.'
                 );
             }
 
-            if (!file_exists($key_file)) {
+            if ( ! file_exists($key_file)) {
                 throw new InvalidApplicationCredentialsException(
                     "Your key file $key_file does not exist."
                 );
@@ -335,7 +334,6 @@ 
     {
         // assume old JWT version if no version check is possible because composer 1 is installed
         return class_exists('Composer\InstalledVersions') ?
-            InstalledVersions::getVersion('firebase/php-jwt') :
-            '';
+            InstalledVersions::getVersion('firebase/php-jwt') : '';
     }
 }

src/Adapter/OAuth2.php

Indentation +716 added lines, -716 removed lines

@@ -24,721 +24,721 @@
  */
 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
-            && (!$state || $this->getStoredData('authorization_state') != $state)
-        ) {
-            $this->deleteStoredData('authorization_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
+			&& (!$state || $this->getStoredData('authorization_state') != $state)
+		) {
+			$this->deleteStoredData('authorization_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;
+	}
 }

Spacing +27 added lines, -27 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
             );
         }
 
@@ -289,7 +289,7 @@ 
         ];
 
         $refreshToken = $this->getStoredData('refresh_token');
-        if (!empty($refreshToken)) {
+        if ( ! empty($refreshToken)) {
             $this->tokenRefreshParameters = [
                 'grant_type' => 'refresh_token',
                 'refresh_token' => $refreshToken,
@@ -297,7 +297,7 @@ 
         }
 
         $this->apiRequestHeaders = [
-            'Authorization' => 'Bearer ' . $this->getStoredData('access_token')
+            'Authorization' => 'Bearer '.$this->getStoredData('access_token')
         ];
     }
 
@@ -336,8 +336,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;
     }
@@ -368,7 +368,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);
 
@@ -425,11 +425,11 @@ 
          * http://tools.ietf.org/html/rfc6749#section-4.1.1
          */
         if ($this->supportRequestState
-            && (!$state || $this->getStoredData('authorization_state') != $state)
+            && ( ! $state || $this->getStoredData('authorization_state') != $state)
         ) {
             $this->deleteStoredData('authorization_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.'
             );
         }
@@ -471,23 +471,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;
     }
 
     /**
@@ -567,9 +567,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)
             );
         }
 
@@ -582,7 +582,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);
@@ -620,11 +620,11 @@ 
      */
     public function refreshAccessToken($parameters = [])
     {
-        $this->tokenRefreshParameters = !empty($parameters)
+        $this->tokenRefreshParameters = ! empty($parameters)
             ? $parameters
             : $this->tokenRefreshParameters;
 
-        if (!$this->isRefreshTokenAvailable()) {
+        if ( ! $this->isRefreshTokenAvailable()) {
             return null;
         }
 
@@ -655,7 +655,7 @@ 
         }
 
         $expires_at = $this->getStoredData('expires_at');
-        if (!$expires_at) {
+        if ( ! $expires_at) {
             return null;
         }
 
@@ -721,21 +721,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);