hybridauth / hybridauth

src/User/Activity.php

Indentation +50 added lines, -50 removed lines

@@ -14,60 +14,60 @@
  */
 final class Activity
 {
-    /**
-     * activity id on the provider side, usually given as integer
-     *
-     * @var string
-     */
-    public $id = null;
+	/**
+	 * activity id on the provider side, usually given as integer
+	 *
+	 * @var string
+	 */
+	public $id = null;
 
-    /**
-     * activity date of creation
-     *
-     * @var string
-     */
-    public $date = null;
+	/**
+	 * activity date of creation
+	 *
+	 * @var string
+	 */
+	public $date = null;
 
-    /**
-     * activity content as a string
-     *
-     * @var string
-     */
-    public $text = null;
+	/**
+	 * activity content as a string
+	 *
+	 * @var string
+	 */
+	public $text = null;
 
-    /**
-     * user who created the activity
-     *
-     * @var object
-     */
-    public $user = null;
+	/**
+	 * user who created the activity
+	 *
+	 * @var object
+	 */
+	public $user = null;
 
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->user = new \stdClass();
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->user = new \stdClass();
 
-        // typically, we should have a few information about the user who created the event from social apis
-        $this->user->identifier = null;
-        $this->user->displayName = null;
-        $this->user->profileURL = null;
-        $this->user->photoURL = null;
-    }
+		// typically, we should have a few information about the user who created the event from social apis
+		$this->user->identifier = null;
+		$this->user->displayName = null;
+		$this->user->profileURL = null;
+		$this->user->photoURL = null;
+	}
 
-    /**
-     * Prevent the providers adapters from adding new fields.
-     *
-     * @throws UnexpectedValueException
-     * @var string $name
-     *
-     * @var mixed $value
-     *
-     */
-    public function __set($name, $value)
-    {
-        // phpcs:ignore
-        throw new UnexpectedValueException(sprintf('Adding new property "%s\' to %s is not allowed.', $name, __CLASS__));
-    }
+	/**
+	 * Prevent the providers adapters from adding new fields.
+	 *
+	 * @throws UnexpectedValueException
+	 * @var string $name
+	 *
+	 * @var mixed $value
+	 *
+	 */
+	public function __set($name, $value)
+	{
+		// phpcs:ignore
+		throw new UnexpectedValueException(sprintf('Adding new property "%s\' to %s is not allowed.', $name, __CLASS__));
+	}
 }

src/User/Contact.php

Indentation +54 added lines, -54 removed lines

@@ -14,65 +14,65 @@
  */
 final class Contact
 {
-    /**
-     * The Unique contact user ID
-     *
-     * @var string
-     */
-    public $identifier = null;
+	/**
+	 * The Unique contact user ID
+	 *
+	 * @var string
+	 */
+	public $identifier = null;
 
-    /**
-     * User website, blog, web page
-     *
-     * @var string
-     */
-    public $webSiteURL = null;
+	/**
+	 * User website, blog, web page
+	 *
+	 * @var string
+	 */
+	public $webSiteURL = null;
 
-    /**
-     * URL link to profile page on the IDp web site
-     *
-     * @var string
-     */
-    public $profileURL = null;
+	/**
+	 * URL link to profile page on the IDp web site
+	 *
+	 * @var string
+	 */
+	public $profileURL = null;
 
-    /**
-     * URL link to user photo or avatar
-     *
-     * @var string
-     */
-    public $photoURL = null;
+	/**
+	 * URL link to user photo or avatar
+	 *
+	 * @var string
+	 */
+	public $photoURL = null;
 
-    /**
-     * User displayName provided by the IDp or a concatenation of first and last name
-     *
-     * @var string
-     */
-    public $displayName = null;
+	/**
+	 * User displayName provided by the IDp or a concatenation of first and last name
+	 *
+	 * @var string
+	 */
+	public $displayName = null;
 
-    /**
-     * A short about_me
-     *
-     * @var string
-     */
-    public $description = null;
+	/**
+	 * A short about_me
+	 *
+	 * @var string
+	 */
+	public $description = null;
 
-    /**
-     * User email. Not all of IDp grant access to the user email
-     *
-     * @var string
-     */
-    public $email = null;
+	/**
+	 * User email. Not all of IDp grant access to the user email
+	 *
+	 * @var string
+	 */
+	public $email = null;
 
-    /**
-     * Prevent the providers adapters from adding new fields.
-     *
-     * @param string $name
-     * @param mixed $value
-     *
-     * @throws UnexpectedValueException
-     */
-    public function __set($name, $value)
-    {
-        throw new UnexpectedValueException(sprintf('Adding new property "%s" to %s is not allowed.', $name, __CLASS__));
-    }
+	/**
+	 * Prevent the providers adapters from adding new fields.
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 *
+	 * @throws UnexpectedValueException
+	 */
+	public function __set($name, $value)
+	{
+		throw new UnexpectedValueException(sprintf('Adding new property "%s" to %s is not allowed.', $name, __CLASS__));
+	}
 }

src/Storage/Session.php

Indentation +113 added lines, -113 removed lines

@@ -14,117 +14,117 @@
  */
 class Session implements StorageInterface
 {
-    /**
-     * Namespace
-     *
-     * @var string
-     */
-    protected $storeNamespace = 'HYBRIDAUTH::STORAGE';
-
-    /**
-     * Key prefix
-     *
-     * @var string
-     */
-    protected $keyPrefix = '';
-
-    /**
-     * Initiate a new session
-     *
-     * @throws RuntimeException
-     */
-    public function __construct()
-    {
-        if (session_id()) {
-            return;
-        }
-
-        if (headers_sent()) {
-            // phpcs:ignore
-            throw new RuntimeException('HTTP headers already sent to browser and Hybridauth won\'t be able to start/resume PHP session. To resolve this, session_start() must be called before outputing any data.');
-        }
-
-        if (!session_start()) {
-            throw new RuntimeException('PHP session failed to start.');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($key)
-    {
-        $key = $this->keyPrefix . strtolower($key);
-
-        if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
-            $value = $_SESSION[$this->storeNamespace][$key];
-
-            if (is_array($value) && array_key_exists('lateObject', $value)) {
-                $value = unserialize($value['lateObject']);
-            }
-
-            return $value;
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $value)
-    {
-        $key = $this->keyPrefix . strtolower($key);
-
-        if (is_object($value)) {
-            // We encapsulate as our classes may be defined after session is initialized.
-            $value = ['lateObject' => serialize($value)];
-        }
-
-        $_SESSION[$this->storeNamespace][$key] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $_SESSION[$this->storeNamespace] = [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($key)
-    {
-        $key = $this->keyPrefix . strtolower($key);
-
-        if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
-            $tmp = $_SESSION[$this->storeNamespace];
-
-            unset($tmp[$key]);
-
-            $_SESSION[$this->storeNamespace] = $tmp;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteMatch($key)
-    {
-        $key = $this->keyPrefix . strtolower($key);
-
-        if (isset($_SESSION[$this->storeNamespace]) && count($_SESSION[$this->storeNamespace])) {
-            $tmp = $_SESSION[$this->storeNamespace];
-
-            foreach ($tmp as $k => $v) {
-                if (strstr($k, $key)) {
-                    unset($tmp[$k]);
-                }
-            }
-
-            $_SESSION[$this->storeNamespace] = $tmp;
-        }
-    }
+	/**
+	 * Namespace
+	 *
+	 * @var string
+	 */
+	protected $storeNamespace = 'HYBRIDAUTH::STORAGE';
+
+	/**
+	 * Key prefix
+	 *
+	 * @var string
+	 */
+	protected $keyPrefix = '';
+
+	/**
+	 * Initiate a new session
+	 *
+	 * @throws RuntimeException
+	 */
+	public function __construct()
+	{
+		if (session_id()) {
+			return;
+		}
+
+		if (headers_sent()) {
+			// phpcs:ignore
+			throw new RuntimeException('HTTP headers already sent to browser and Hybridauth won\'t be able to start/resume PHP session. To resolve this, session_start() must be called before outputing any data.');
+		}
+
+		if (!session_start()) {
+			throw new RuntimeException('PHP session failed to start.');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($key)
+	{
+		$key = $this->keyPrefix . strtolower($key);
+
+		if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
+			$value = $_SESSION[$this->storeNamespace][$key];
+
+			if (is_array($value) && array_key_exists('lateObject', $value)) {
+				$value = unserialize($value['lateObject']);
+			}
+
+			return $value;
+		}
+
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($key, $value)
+	{
+		$key = $this->keyPrefix . strtolower($key);
+
+		if (is_object($value)) {
+			// We encapsulate as our classes may be defined after session is initialized.
+			$value = ['lateObject' => serialize($value)];
+		}
+
+		$_SESSION[$this->storeNamespace][$key] = $value;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function clear()
+	{
+		$_SESSION[$this->storeNamespace] = [];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($key)
+	{
+		$key = $this->keyPrefix . strtolower($key);
+
+		if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
+			$tmp = $_SESSION[$this->storeNamespace];
+
+			unset($tmp[$key]);
+
+			$_SESSION[$this->storeNamespace] = $tmp;
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function deleteMatch($key)
+	{
+		$key = $this->keyPrefix . strtolower($key);
+
+		if (isset($_SESSION[$this->storeNamespace]) && count($_SESSION[$this->storeNamespace])) {
+			$tmp = $_SESSION[$this->storeNamespace];
+
+			foreach ($tmp as $k => $v) {
+				if (strstr($k, $key)) {
+					unset($tmp[$k]);
+				}
+			}
+
+			$_SESSION[$this->storeNamespace] = $tmp;
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
             throw new RuntimeException('HTTP headers already sent to browser and Hybridauth won\'t be able to start/resume PHP session. To resolve this, session_start() must be called before outputing any data.');
         }
 
-        if (!session_start()) {
+        if ( ! session_start()) {
             throw new RuntimeException('PHP session failed to start.');
         }
     }
@@ -54,7 +54,7 @@ 
      */
     public function get($key)
     {
-        $key = $this->keyPrefix . strtolower($key);
+        $key = $this->keyPrefix.strtolower($key);
 
         if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
             $value = $_SESSION[$this->storeNamespace][$key];
@@ -74,7 +74,7 @@ 
      */
     public function set($key, $value)
     {
-        $key = $this->keyPrefix . strtolower($key);
+        $key = $this->keyPrefix.strtolower($key);
 
         if (is_object($value)) {
             // We encapsulate as our classes may be defined after session is initialized.
@@ -97,7 +97,7 @@ 
      */
     public function delete($key)
     {
-        $key = $this->keyPrefix . strtolower($key);
+        $key = $this->keyPrefix.strtolower($key);
 
         if (isset($_SESSION[$this->storeNamespace], $_SESSION[$this->storeNamespace][$key])) {
             $tmp = $_SESSION[$this->storeNamespace];
@@ -113,7 +113,7 @@ 
      */
     public function deleteMatch($key)
     {
-        $key = $this->keyPrefix . strtolower($key);
+        $key = $this->keyPrefix.strtolower($key);
 
         if (isset($_SESSION[$this->storeNamespace]) && count($_SESSION[$this->storeNamespace])) {
             $tmp = $_SESSION[$this->storeNamespace];

src/Provider/Medium.php

Indentation +56 added lines, -56 removed lines

@@ -17,72 +17,72 @@
  */
 class Medium extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'basicProfile';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'basicProfile';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.medium.com/v1/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.medium.com/v1/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://medium.com/m/oauth/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://medium.com/m/oauth/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.medium.com/v1/tokens';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.medium.com/v1/tokens';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://github.com/Medium/medium-api-docs';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://github.com/Medium/medium-api-docs';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
 
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-    }
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * See: https://github.com/Medium/medium-api-docs#getting-the-authenticated-users-details
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me');
+	/**
+	 * {@inheritdoc}
+	 *
+	 * See: https://github.com/Medium/medium-api-docs#getting-the-authenticated-users-details
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        $userProfile = new User\Profile();
-        $data = $data->filter('data');
+		$userProfile = new User\Profile();
+		$data = $data->filter('data');
 
-        $full_name = explode(' ', $data->get('name'));
-        if (count($full_name) < 2) {
-            $full_name[1] = '';
-        }
+		$full_name = explode(' ', $data->get('name'));
+		if (count($full_name) < 2) {
+			$full_name[1] = '';
+		}
 
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('username');
-        $userProfile->profileURL = $data->get('imageUrl');
-        $userProfile->firstName = $full_name[0];
-        $userProfile->lastName = $full_name[1];
-        $userProfile->profileURL = $data->get('url');
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('username');
+		$userProfile->profileURL = $data->get('imageUrl');
+		$userProfile->firstName = $full_name[0];
+		$userProfile->lastName = $full_name[1];
+		$userProfile->profileURL = $data->get('url');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/Instagram.php

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
     {
         $collection = parent::validateAccessTokenExchange($response);
 
-        if (!$collection->exists('expires_in')) {
+        if ( ! $collection->exists('expires_in')) {
             // Instagram tokens always expire in an hour, but this is implicit not explicit
 
             $expires_in = 60 * 60;
@@ -91,7 +91,7 @@ 
      */
     public function maintainToken()
     {
-        if (!$this->isConnected()) {
+        if ( ! $this->isConnected()) {
             return;
         }
 
@@ -99,7 +99,7 @@ 
         $exchange_by_expiry_days = $this->config->get('exchange_by_expiry_days') ?: 45;
         if ($exchange_by_expiry_days !== null) {
             $projected_timestamp = time() + 60 * 60 * 24 * $exchange_by_expiry_days;
-            if (!$this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
+            if ( ! $this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
                 $this->exchangeAccessToken();
             }
         }
@@ -144,7 +144,7 @@ 
         ]);
 
         $data = new Collection($response);
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -200,7 +200,7 @@ 
         $response = $this->apiRequest('me/media', 'GET', $params);
 
         $data = new Collection($response);
-        if (!$data->exists('data')) {
+        if ( ! $data->exists('data')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -240,7 +240,7 @@ 
         ]);
 
         $data = new Collection($response);
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 

Indentation +231 added lines, -231 removed lines

@@ -17,240 +17,240 @@
  */
 class Instagram extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'user_profile,user_media';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://graph.instagram.com';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://api.instagram.com/oauth/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.instagram.com/oauth/access_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developers.facebook.com/docs/instagram-basic-display-api';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        // The Instagram API requires an access_token from authenticated users
-        // for each endpoint.
-        $accessToken = $this->getStoredData($this->accessTokenName);
-        $this->apiRequestParameters[$this->accessTokenName] = $accessToken;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        if (!$collection->exists('expires_in')) {
-            // Instagram tokens always expire in an hour, but this is implicit not explicit
-
-            $expires_in = 60 * 60;
-
-            $expires_at = time() + $expires_in;
-
-            $this->storeData('expires_in', $expires_in);
-            $this->storeData('expires_at', $expires_at);
-        }
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function maintainToken()
-    {
-        if (!$this->isConnected()) {
-            return;
-        }
-
-        // Handle token exchange prior to the standard handler for an API request
-        $exchange_by_expiry_days = $this->config->get('exchange_by_expiry_days') ?: 45;
-        if ($exchange_by_expiry_days !== null) {
-            $projected_timestamp = time() + 60 * 60 * 24 * $exchange_by_expiry_days;
-            if (!$this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
-                $this->exchangeAccessToken();
-            }
-        }
-    }
-
-    /**
-     * Exchange the Access Token with one that expires further in the future.
-     *
-     * @return string Raw Provider API response
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws InvalidAccessTokenException
-     */
-    public function exchangeAccessToken()
-    {
-        if ($this->getStoredData('expires_in') >= 5000000) {
-            /*
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'user_profile,user_media';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://graph.instagram.com';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://api.instagram.com/oauth/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.instagram.com/oauth/access_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developers.facebook.com/docs/instagram-basic-display-api';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		// The Instagram API requires an access_token from authenticated users
+		// for each endpoint.
+		$accessToken = $this->getStoredData($this->accessTokenName);
+		$this->apiRequestParameters[$this->accessTokenName] = $accessToken;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		if (!$collection->exists('expires_in')) {
+			// Instagram tokens always expire in an hour, but this is implicit not explicit
+
+			$expires_in = 60 * 60;
+
+			$expires_at = time() + $expires_in;
+
+			$this->storeData('expires_in', $expires_in);
+			$this->storeData('expires_at', $expires_at);
+		}
+
+		return $collection;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function maintainToken()
+	{
+		if (!$this->isConnected()) {
+			return;
+		}
+
+		// Handle token exchange prior to the standard handler for an API request
+		$exchange_by_expiry_days = $this->config->get('exchange_by_expiry_days') ?: 45;
+		if ($exchange_by_expiry_days !== null) {
+			$projected_timestamp = time() + 60 * 60 * 24 * $exchange_by_expiry_days;
+			if (!$this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
+				$this->exchangeAccessToken();
+			}
+		}
+	}
+
+	/**
+	 * Exchange the Access Token with one that expires further in the future.
+	 *
+	 * @return string Raw Provider API response
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws InvalidAccessTokenException
+	 */
+	public function exchangeAccessToken()
+	{
+		if ($this->getStoredData('expires_in') >= 5000000) {
+			/*
             Refresh a long-lived token (needed on Instagram, but not Facebook).
             It's not an oAuth style refresh using a refresh token.
             Actually it's really just another exchange, and invalidates the old token.
             Facebook/Instagram documentation is not very helpful at explaining that!
             */
-            $exchangeTokenParameters = [
-                'grant_type'        => 'ig_refresh_token',
-                'client_secret'     => $this->clientSecret,
-                'access_token'      => $this->getStoredData('access_token'),
-            ];
-            $url = 'https://graph.instagram.com/refresh_access_token';
-        } else {
-            // Exchange short-lived to long-lived
-            $exchangeTokenParameters = [
-                'grant_type'        => 'ig_exchange_token',
-                'client_secret'     => $this->clientSecret,
-                'access_token'      => $this->getStoredData('access_token'),
-            ];
-            $url = 'https://graph.instagram.com/access_token';
-        }
-
-        $response = $this->httpClient->request(
-            $url,
-            'GET',
-            $exchangeTokenParameters
-        );
-
-        $this->validateApiResponse('Unable to exchange the access token');
-
-        $this->validateAccessTokenExchange($response);
-
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me', 'GET', [
-            'fields' => 'id,username,account_type,media_count',
-        ]);
-
-        $data = new 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('username');
-        $userProfile->profileURL = "https://instagram.com/{$userProfile->displayName}";
-        $userProfile->data = [
-            'account_type' => $data->get('account_type'),
-            'media_count' => $data->get('media_count'),
-        ];
-
-        return $userProfile;
-    }
-
-    /**
-     * Fetch user medias.
-     *
-     * @param int $limit Number of elements per page.
-     * @param string $pageId Current pager ID.
-     * @param array|null $fields Fields to fetch per media.
-     *
-     * @return \Hybridauth\Data\Collection
-     *
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws \Hybridauth\Exception\InvalidAccessTokenException
-     * @throws \Hybridauth\Exception\UnexpectedApiResponseException
-     */
-    public function getUserMedia($limit = 12, $pageId = null, array $fields = null)
-    {
-        if (empty($fields)) {
-            $fields = [
-                'id',
-                'caption',
-                'media_type',
-                'media_url',
-                'thumbnail_url',
-                'permalink',
-                'timestamp',
-                'username',
-            ];
-        }
-
-        $params = [
-            'fields' => implode(',', $fields),
-            'limit' => $limit,
-        ];
-        if ($pageId !== null) {
-            $params['after'] = $pageId;
-        }
-
-        $response = $this->apiRequest('me/media', 'GET', $params);
-
-        $data = new Collection($response);
-        if (!$data->exists('data')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        return $data;
-    }
-
-    /**
-     * Fetches a single user's media.
-     *
-     * @param string $mediaId Media ID.
-     * @param array|null $fields Fields to fetch per media.
-     *
-     * @return \Hybridauth\Data\Collection
-     *
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws \Hybridauth\Exception\InvalidAccessTokenException
-     * @throws \Hybridauth\Exception\UnexpectedApiResponseException
-     */
-    public function getMedia($mediaId, array $fields = null)
-    {
-        if (empty($fields)) {
-            $fields = [
-                'id',
-                'caption',
-                'media_type',
-                'media_url',
-                'thumbnail_url',
-                'permalink',
-                'timestamp',
-                'username',
-            ];
-        }
-
-        $response = $this->apiRequest($mediaId, 'GET', [
-            'fields' => implode(',', $fields),
-        ]);
-
-        $data = new Collection($response);
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        return $data;
-    }
+			$exchangeTokenParameters = [
+				'grant_type'        => 'ig_refresh_token',
+				'client_secret'     => $this->clientSecret,
+				'access_token'      => $this->getStoredData('access_token'),
+			];
+			$url = 'https://graph.instagram.com/refresh_access_token';
+		} else {
+			// Exchange short-lived to long-lived
+			$exchangeTokenParameters = [
+				'grant_type'        => 'ig_exchange_token',
+				'client_secret'     => $this->clientSecret,
+				'access_token'      => $this->getStoredData('access_token'),
+			];
+			$url = 'https://graph.instagram.com/access_token';
+		}
+
+		$response = $this->httpClient->request(
+			$url,
+			'GET',
+			$exchangeTokenParameters
+		);
+
+		$this->validateApiResponse('Unable to exchange the access token');
+
+		$this->validateAccessTokenExchange($response);
+
+		return $response;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me', 'GET', [
+			'fields' => 'id,username,account_type,media_count',
+		]);
+
+		$data = new 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('username');
+		$userProfile->profileURL = "https://instagram.com/{$userProfile->displayName}";
+		$userProfile->data = [
+			'account_type' => $data->get('account_type'),
+			'media_count' => $data->get('media_count'),
+		];
+
+		return $userProfile;
+	}
+
+	/**
+	 * Fetch user medias.
+	 *
+	 * @param int $limit Number of elements per page.
+	 * @param string $pageId Current pager ID.
+	 * @param array|null $fields Fields to fetch per media.
+	 *
+	 * @return \Hybridauth\Data\Collection
+	 *
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws \Hybridauth\Exception\InvalidAccessTokenException
+	 * @throws \Hybridauth\Exception\UnexpectedApiResponseException
+	 */
+	public function getUserMedia($limit = 12, $pageId = null, array $fields = null)
+	{
+		if (empty($fields)) {
+			$fields = [
+				'id',
+				'caption',
+				'media_type',
+				'media_url',
+				'thumbnail_url',
+				'permalink',
+				'timestamp',
+				'username',
+			];
+		}
+
+		$params = [
+			'fields' => implode(',', $fields),
+			'limit' => $limit,
+		];
+		if ($pageId !== null) {
+			$params['after'] = $pageId;
+		}
+
+		$response = $this->apiRequest('me/media', 'GET', $params);
+
+		$data = new Collection($response);
+		if (!$data->exists('data')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Fetches a single user's media.
+	 *
+	 * @param string $mediaId Media ID.
+	 * @param array|null $fields Fields to fetch per media.
+	 *
+	 * @return \Hybridauth\Data\Collection
+	 *
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws \Hybridauth\Exception\InvalidAccessTokenException
+	 * @throws \Hybridauth\Exception\UnexpectedApiResponseException
+	 */
+	public function getMedia($mediaId, array $fields = null)
+	{
+		if (empty($fields)) {
+			$fields = [
+				'id',
+				'caption',
+				'media_type',
+				'media_url',
+				'thumbnail_url',
+				'permalink',
+				'timestamp',
+				'username',
+			];
+		}
+
+		$response = $this->apiRequest($mediaId, 'GET', [
+			'fields' => implode(',', $fields),
+		]);
+
+		$data = new Collection($response);
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		return $data;
+	}
 }

src/Adapter/AdapterInterface.php

Indentation +136 added lines, -136 removed lines

@@ -16,140 +16,140 @@
  */
 interface AdapterInterface
 {
-    /**
-     * Initiate the appropriate protocol and process/automate the authentication or authorization flow.
-     *
-     * @return bool|null
-     */
-    public function authenticate();
-
-    /**
-     * Returns TRUE if the user is connected
-     *
-     * @return bool
-     */
-    public function isConnected();
-
-    /**
-     * Clear all access token in storage
-     */
-    public function disconnect();
-
-    /**
-     * Retrieve the connected user profile
-     *
-     * @return \Hybridauth\User\Profile
-     */
-    public function getUserProfile();
-
-    /**
-     * Retrieve the connected user contacts list
-     *
-     * @return \Hybridauth\User\Contact[]
-     */
-    public function getUserContacts();
-
-    /**
-     * Retrieve the connected user pages|companies|groups list
-     *
-     * @return array
-     */
-    public function getUserPages();
-
-    /**
-     * Retrieve the user activity stream
-     *
-     * @param string $stream
-     *
-     * @return \Hybridauth\User\Activity[]
-     */
-    public function getUserActivity($stream);
-
-    /**
-     * Post a status on user wall|timeline|blog|website|etc.
-     *
-     * @param string|array $status
-     *
-     * @return mixed API response
-     */
-    public function setUserStatus($status);
-
-    /**
-     * Post a status on page|company|group wall.
-     *
-     * @param string|array $status
-     * @param string $pageId
-     *
-     * @return mixed API response
-     */
-    public function setPageStatus($status, $pageId);
-
-    /**
-     * Send a signed request to provider API
-     *
-     * @param string $url
-     * @param string $method
-     * @param array $parameters
-     * @param array $headers
-     * @param bool $multipart
-     *
-     * @return mixed
-     */
-    public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false);
-
-    /**
-     * Do whatever may be necessary to make sure tokens do not expire.
-     * Intended to be be called frequently, e.g. via Cron.
-     */
-    public function maintainToken();
-
-    /**
-     * Return oauth access tokens.
-     *
-     * @return array
-     */
-    public function getAccessToken();
-
-    /**
-     * Set oauth access tokens.
-     *
-     * @param array $tokens
-     */
-    public function setAccessToken($tokens = []);
-
-    /**
-     * Set http client instance.
-     *
-     * @param HttpClientInterface $httpClient
-     */
-    public function setHttpClient(HttpClientInterface $httpClient = null);
-
-    /**
-     * Return http client instance.
-     */
-    public function getHttpClient();
-
-    /**
-     * Set storage instance.
-     *
-     * @param StorageInterface $storage
-     */
-    public function setStorage(StorageInterface $storage = null);
-
-    /**
-     * Return storage instance.
-     */
-    public function getStorage();
-
-    /**
-     * Set Logger instance.
-     *
-     * @param LoggerInterface $logger
-     */
-    public function setLogger(LoggerInterface $logger = null);
-
-    /**
-     * Return logger instance.
-     */
-    public function getLogger();
+	/**
+	 * Initiate the appropriate protocol and process/automate the authentication or authorization flow.
+	 *
+	 * @return bool|null
+	 */
+	public function authenticate();
+
+	/**
+	 * Returns TRUE if the user is connected
+	 *
+	 * @return bool
+	 */
+	public function isConnected();
+
+	/**
+	 * Clear all access token in storage
+	 */
+	public function disconnect();
+
+	/**
+	 * Retrieve the connected user profile
+	 *
+	 * @return \Hybridauth\User\Profile
+	 */
+	public function getUserProfile();
+
+	/**
+	 * Retrieve the connected user contacts list
+	 *
+	 * @return \Hybridauth\User\Contact[]
+	 */
+	public function getUserContacts();
+
+	/**
+	 * Retrieve the connected user pages|companies|groups list
+	 *
+	 * @return array
+	 */
+	public function getUserPages();
+
+	/**
+	 * Retrieve the user activity stream
+	 *
+	 * @param string $stream
+	 *
+	 * @return \Hybridauth\User\Activity[]
+	 */
+	public function getUserActivity($stream);
+
+	/**
+	 * Post a status on user wall|timeline|blog|website|etc.
+	 *
+	 * @param string|array $status
+	 *
+	 * @return mixed API response
+	 */
+	public function setUserStatus($status);
+
+	/**
+	 * Post a status on page|company|group wall.
+	 *
+	 * @param string|array $status
+	 * @param string $pageId
+	 *
+	 * @return mixed API response
+	 */
+	public function setPageStatus($status, $pageId);
+
+	/**
+	 * Send a signed request to provider API
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param array $parameters
+	 * @param array $headers
+	 * @param bool $multipart
+	 *
+	 * @return mixed
+	 */
+	public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false);
+
+	/**
+	 * Do whatever may be necessary to make sure tokens do not expire.
+	 * Intended to be be called frequently, e.g. via Cron.
+	 */
+	public function maintainToken();
+
+	/**
+	 * Return oauth access tokens.
+	 *
+	 * @return array
+	 */
+	public function getAccessToken();
+
+	/**
+	 * Set oauth access tokens.
+	 *
+	 * @param array $tokens
+	 */
+	public function setAccessToken($tokens = []);
+
+	/**
+	 * Set http client instance.
+	 *
+	 * @param HttpClientInterface $httpClient
+	 */
+	public function setHttpClient(HttpClientInterface $httpClient = null);
+
+	/**
+	 * Return http client instance.
+	 */
+	public function getHttpClient();
+
+	/**
+	 * Set storage instance.
+	 *
+	 * @param StorageInterface $storage
+	 */
+	public function setStorage(StorageInterface $storage = null);
+
+	/**
+	 * Return storage instance.
+	 */
+	public function getStorage();
+
+	/**
+	 * Set Logger instance.
+	 *
+	 * @param LoggerInterface $logger
+	 */
+	public function setLogger(LoggerInterface $logger = null);
+
+	/**
+	 * Return logger instance.
+	 */
+	public function getLogger();
 }

src/Provider/MicrosoftGraph.php

Indentation +123 added lines, -123 removed lines

@@ -43,127 +43,127 @@
  */
 class MicrosoftGraph extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'openid user.read contacts.read';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://graph.microsoft.com/v1.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.microsoft.com/en-us/graph/docs/concepts/php';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $tenant = $this->config->get('tenant');
-        if (!empty($tenant)) {
-            $adjustedEndpoints = [
-                'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
-                'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
-            ];
-
-            $this->setApiEndpoints($adjustedEndpoints);
-        }
-    }
-
-    /**
-     * {@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('displayName');
-        $userProfile->firstName = $data->get('givenName');
-        $userProfile->lastName = $data->get('surname');
-        $userProfile->language = $data->get('preferredLanguage');
-
-        $userProfile->phone = $data->get('mobilePhone');
-        if (empty($userProfile->phone)) {
-            $businessPhones = $data->get('businessPhones');
-            if (isset($businessPhones[0])) {
-                $userProfile->phone = $businessPhones[0];
-            }
-        }
-
-        $userProfile->email = $data->get('mail');
-        if (empty($userProfile->email)) {
-            $email = $data->get('userPrincipalName');
-            if (strpos($email, '@') !== false) {
-                $userProfile->email = $email;
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts()
-    {
-        $apiUrl = 'me/contacts?$top=50';
-        $contacts = [];
-
-        do {
-            $response = $this->apiRequest($apiUrl);
-            $data = new Data\Collection($response);
-            if (!$data->exists('value')) {
-                throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-            }
-            foreach ($data->filter('value')->toArray() as $entry) {
-                $entry = new Data\Collection($entry);
-                $userContact = new User\Contact();
-                $userContact->identifier = $entry->get('id');
-                $userContact->displayName = $entry->get('displayName');
-                $emailAddresses = $entry->get('emailAddresses');
-                if (!empty($emailAddresses)) {
-                    $userContact->email = $emailAddresses[0]->address;
-                }
-                // only add to collection if we have usefull data
-                if (!empty($userContact->displayName) || !empty($userContact->email)) {
-                    $contacts[] = $userContact;
-                }
-            }
-
-            if ($data->exists('@odata.nextLink')) {
-                $apiUrl = $data->get('@odata.nextLink');
-
-                $pagedList = true;
-            } else {
-                $pagedList = false;
-            }
-        } while ($pagedList);
-
-        return $contacts;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'openid user.read contacts.read';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://graph.microsoft.com/v1.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.microsoft.com/en-us/graph/docs/concepts/php';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$tenant = $this->config->get('tenant');
+		if (!empty($tenant)) {
+			$adjustedEndpoints = [
+				'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
+				'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
+			];
+
+			$this->setApiEndpoints($adjustedEndpoints);
+		}
+	}
+
+	/**
+	 * {@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('displayName');
+		$userProfile->firstName = $data->get('givenName');
+		$userProfile->lastName = $data->get('surname');
+		$userProfile->language = $data->get('preferredLanguage');
+
+		$userProfile->phone = $data->get('mobilePhone');
+		if (empty($userProfile->phone)) {
+			$businessPhones = $data->get('businessPhones');
+			if (isset($businessPhones[0])) {
+				$userProfile->phone = $businessPhones[0];
+			}
+		}
+
+		$userProfile->email = $data->get('mail');
+		if (empty($userProfile->email)) {
+			$email = $data->get('userPrincipalName');
+			if (strpos($email, '@') !== false) {
+				$userProfile->email = $email;
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts()
+	{
+		$apiUrl = 'me/contacts?$top=50';
+		$contacts = [];
+
+		do {
+			$response = $this->apiRequest($apiUrl);
+			$data = new Data\Collection($response);
+			if (!$data->exists('value')) {
+				throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+			}
+			foreach ($data->filter('value')->toArray() as $entry) {
+				$entry = new Data\Collection($entry);
+				$userContact = new User\Contact();
+				$userContact->identifier = $entry->get('id');
+				$userContact->displayName = $entry->get('displayName');
+				$emailAddresses = $entry->get('emailAddresses');
+				if (!empty($emailAddresses)) {
+					$userContact->email = $emailAddresses[0]->address;
+				}
+				// only add to collection if we have usefull data
+				if (!empty($userContact->displayName) || !empty($userContact->email)) {
+					$contacts[] = $userContact;
+				}
+			}
+
+			if ($data->exists('@odata.nextLink')) {
+				$apiUrl = $data->get('@odata.nextLink');
+
+				$pagedList = true;
+			} else {
+				$pagedList = false;
+			}
+		} while ($pagedList);
+
+		return $contacts;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,10 +76,10 @@ 
         parent::initialize();
 
         $tenant = $this->config->get('tenant');
-        if (!empty($tenant)) {
+        if ( ! empty($tenant)) {
             $adjustedEndpoints = [
-                'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
-                'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
+                'authorize_url' => str_replace('/common/', '/'.$tenant.'/', $this->authorizeUrl),
+                'access_token_url' => str_replace('/common/', '/'.$tenant.'/', $this->accessTokenUrl),
             ];
 
             $this->setApiEndpoints($adjustedEndpoints);
@@ -95,7 +95,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -137,7 +137,7 @@ 
         do {
             $response = $this->apiRequest($apiUrl);
             $data = new Data\Collection($response);
-            if (!$data->exists('value')) {
+            if ( ! $data->exists('value')) {
                 throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
             }
             foreach ($data->filter('value')->toArray() as $entry) {
@@ -146,11 +146,11 @@ 
                 $userContact->identifier = $entry->get('id');
                 $userContact->displayName = $entry->get('displayName');
                 $emailAddresses = $entry->get('emailAddresses');
-                if (!empty($emailAddresses)) {
+                if ( ! empty($emailAddresses)) {
                     $userContact->email = $emailAddresses[0]->address;
                 }
                 // only add to collection if we have usefull data
-                if (!empty($userContact->displayName) || !empty($userContact->email)) {
+                if ( ! empty($userContact->displayName) || ! empty($userContact->email)) {
                     $contacts[] = $userContact;
                 }
             }

src/Provider/WeChat.php

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('openid')) {
+        if ( ! $data->exists('openid')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -128,7 +128,7 @@ 
         $userProfile->region = $data->get('province');
         $userProfile->country = $data->get('country');
         $genders = ['', 'male', 'female'];
-        $userProfile->gender = $genders[(int)$data->get('sex')];
+        $userProfile->gender = $genders[(int) $data->get('sex')];
 
         return $userProfile;
     }

Indentation +117 added lines, -117 removed lines

@@ -17,121 +17,121 @@
  */
 class WeChat extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'snsapi_login,snsapi_userinfo,scope.userInfo';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.wechat.com/sns/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://open.weixin.qq.com/connect/qrconnect';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.wechat.com/sns/oauth2/access_token';
-
-    /**
-     * Refresh Token Endpoint
-     * @var string
-     */
-    protected $tokenRefreshUrl = 'https://api.wechat.com/sns/oauth2/refresh_token';
-
-    /**
-     * {@ịnheritdoc}
-     */
-    protected $accessTokenInfoUrl = 'https://api.wechat.com/sns/auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenExchangeMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenRefreshMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = ''; // Not available
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'appid' => $this->clientId
-        ];
-        unset($this->AuthorizeUrlParameters['client_id']);
-
-        $this->tokenExchangeParameters += [
-            'appid' => $this->clientId,
-            'secret' => $this->clientSecret
-        ];
-        unset($this->tokenExchangeParameters['client_id']);
-        unset($this->tokenExchangeParameters['client_secret']);
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'appid' => $this->clientId,
-            ];
-        }
-
-        $this->apiRequestParameters = [
-            'appid' => $this->clientId,
-            'secret' => $this->clientSecret
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        $this->storeData('openid', $collection->get('openid'));
-        $this->storeData('access_token', $collection->get('access_token'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $openid = $this->getStoredData('openid');
-        $access_token = $this->getStoredData('access_token');
-
-        $response = $this->apiRequest('userinfo', 'GET', ['openid' => $openid, 'access_token' => $access_token]);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('openid')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('openid');
-        $userProfile->displayName = $data->get('nickname');
-        $userProfile->photoURL = $data->get('headimgurl');
-        $userProfile->city = $data->get('city');
-        $userProfile->region = $data->get('province');
-        $userProfile->country = $data->get('country');
-        $genders = ['', 'male', 'female'];
-        $userProfile->gender = $genders[(int)$data->get('sex')];
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'snsapi_login,snsapi_userinfo,scope.userInfo';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.wechat.com/sns/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://open.weixin.qq.com/connect/qrconnect';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.wechat.com/sns/oauth2/access_token';
+
+	/**
+	 * Refresh Token Endpoint
+	 * @var string
+	 */
+	protected $tokenRefreshUrl = 'https://api.wechat.com/sns/oauth2/refresh_token';
+
+	/**
+	 * {@ịnheritdoc}
+	 */
+	protected $accessTokenInfoUrl = 'https://api.wechat.com/sns/auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenExchangeMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenRefreshMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = ''; // Not available
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'appid' => $this->clientId
+		];
+		unset($this->AuthorizeUrlParameters['client_id']);
+
+		$this->tokenExchangeParameters += [
+			'appid' => $this->clientId,
+			'secret' => $this->clientSecret
+		];
+		unset($this->tokenExchangeParameters['client_id']);
+		unset($this->tokenExchangeParameters['client_secret']);
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'appid' => $this->clientId,
+			];
+		}
+
+		$this->apiRequestParameters = [
+			'appid' => $this->clientId,
+			'secret' => $this->clientSecret
+		];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		$this->storeData('openid', $collection->get('openid'));
+		$this->storeData('access_token', $collection->get('access_token'));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$openid = $this->getStoredData('openid');
+		$access_token = $this->getStoredData('access_token');
+
+		$response = $this->apiRequest('userinfo', 'GET', ['openid' => $openid, 'access_token' => $access_token]);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('openid')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('openid');
+		$userProfile->displayName = $data->get('nickname');
+		$userProfile->photoURL = $data->get('headimgurl');
+		$userProfile->city = $data->get('city');
+		$userProfile->region = $data->get('province');
+		$userProfile->country = $data->get('country');
+		$genders = ['', 'male', 'female'];
+		$userProfile->gender = $genders[(int)$data->get('sex')];
+
+		return $userProfile;
+	}
 }

src/Provider/Telegram.php

Indentation +164 added lines, -164 removed lines

@@ -44,143 +44,143 @@ 
  */
 class Telegram extends AbstractAdapter implements AdapterInterface
 {
-    protected $botId = '';
-
-    protected $botSecret = '';
-
-    protected $callbackUrl = '';
-
-    /**
-     * IPD API Documentation
-     *
-     * OPTIONAL.
-     *
-     * @var string
-     */
-    protected $apiDocumentation = 'https://core.telegram.org/bots';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->botId = $this->config->filter('keys')->get('id');
-        $this->botSecret = $this->config->filter('keys')->get('secret');
-        $this->callbackUrl = $this->config->get('callback');
-
-        if (!$this->botId || !$this->botSecret) {
-            throw new InvalidApplicationCredentialsException(
-                'Your application id is required in order to connect to ' . $this->providerId
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate()
-    {
-        $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-        if (!filter_input(INPUT_GET, 'hash')) {
-            $this->authenticateBegin();
-        } else {
-            $this->authenticateCheckError();
-            $this->authenticateFinish();
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        $authData = $this->getStoredData('auth_data');
-        return !empty($authData);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $data = new Collection($this->getStoredData('auth_data'));
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->firstName = $data->get('first_name');
-        $userProfile->lastName = $data->get('last_name');
-        $userProfile->displayName = $data->get('username');
-        $userProfile->photoURL = $data->get('photo_url');
-        $username = $data->get('username');
-        if (!empty($username)) {
-            // Only some accounts have usernames.
-            $userProfile->profileURL = "https://t.me/{$username}";
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * See: https://telegram.im/widget-login.php
-     * See: https://gist.github.com/anonymous/6516521b1fb3b464534fbc30ea3573c2
-     */
-    protected function authenticateCheckError()
-    {
-        $auth_data = $this->parseAuthData();
-
-        $check_hash = $auth_data['hash'];
-        unset($auth_data['hash']);
-        $data_check_arr = [];
-
-        foreach ($auth_data as $key => $value) {
-            if (!empty($value)) {
-                $data_check_arr[] = $key . '=' . $value;
-            }
-        }
-        sort($data_check_arr);
-
-        $data_check_string = implode("\n", $data_check_arr);
-        $secret_key = hash('sha256', $this->botSecret, true);
-        $hash = hash_hmac('sha256', $data_check_string, $secret_key);
-
-        if (strcmp($hash, $check_hash) !== 0) {
-            throw new InvalidAuthorizationCodeException(
-                sprintf('Provider returned an error: %s', 'Data is NOT from Telegram')
-            );
-        }
-
-        if ((time() - $auth_data['auth_date']) > 86400) {
-            throw new InvalidAuthorizationCodeException(
-                sprintf('Provider returned an error: %s', 'Data is outdated')
-            );
-        }
-    }
-
-    /**
-     * See: https://telegram.im/widget-login.php
-     */
-    protected function authenticateBegin()
-    {
-        $this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)));
-
-        $nonce = $this->config->get('nonce');
-        $nonce_code = empty($nonce) ? '' : "nonce=\"{$nonce}\"";
-
-        exit(
-            <<<HTML
+	protected $botId = '';
+
+	protected $botSecret = '';
+
+	protected $callbackUrl = '';
+
+	/**
+	 * IPD API Documentation
+	 *
+	 * OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $apiDocumentation = 'https://core.telegram.org/bots';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this->botId = $this->config->filter('keys')->get('id');
+		$this->botSecret = $this->config->filter('keys')->get('secret');
+		$this->callbackUrl = $this->config->get('callback');
+
+		if (!$this->botId || !$this->botSecret) {
+			throw new InvalidApplicationCredentialsException(
+				'Your application id is required in order to connect to ' . $this->providerId
+			);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticate()
+	{
+		$this->logger->info(sprintf('%s::authenticate()', get_class($this)));
+		if (!filter_input(INPUT_GET, 'hash')) {
+			$this->authenticateBegin();
+		} else {
+			$this->authenticateCheckError();
+			$this->authenticateFinish();
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConnected()
+	{
+		$authData = $this->getStoredData('auth_data');
+		return !empty($authData);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$data = new Collection($this->getStoredData('auth_data'));
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->firstName = $data->get('first_name');
+		$userProfile->lastName = $data->get('last_name');
+		$userProfile->displayName = $data->get('username');
+		$userProfile->photoURL = $data->get('photo_url');
+		$username = $data->get('username');
+		if (!empty($username)) {
+			// Only some accounts have usernames.
+			$userProfile->profileURL = "https://t.me/{$username}";
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * See: https://telegram.im/widget-login.php
+	 * See: https://gist.github.com/anonymous/6516521b1fb3b464534fbc30ea3573c2
+	 */
+	protected function authenticateCheckError()
+	{
+		$auth_data = $this->parseAuthData();
+
+		$check_hash = $auth_data['hash'];
+		unset($auth_data['hash']);
+		$data_check_arr = [];
+
+		foreach ($auth_data as $key => $value) {
+			if (!empty($value)) {
+				$data_check_arr[] = $key . '=' . $value;
+			}
+		}
+		sort($data_check_arr);
+
+		$data_check_string = implode("\n", $data_check_arr);
+		$secret_key = hash('sha256', $this->botSecret, true);
+		$hash = hash_hmac('sha256', $data_check_string, $secret_key);
+
+		if (strcmp($hash, $check_hash) !== 0) {
+			throw new InvalidAuthorizationCodeException(
+				sprintf('Provider returned an error: %s', 'Data is NOT from Telegram')
+			);
+		}
+
+		if ((time() - $auth_data['auth_date']) > 86400) {
+			throw new InvalidAuthorizationCodeException(
+				sprintf('Provider returned an error: %s', 'Data is outdated')
+			);
+		}
+	}
+
+	/**
+	 * See: https://telegram.im/widget-login.php
+	 */
+	protected function authenticateBegin()
+	{
+		$this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)));
+
+		$nonce = $this->config->get('nonce');
+		$nonce_code = empty($nonce) ? '' : "nonce=\"{$nonce}\"";
+
+		exit(
+			<<<HTML
 <center>
     <script async src="https://telegram.org/js/telegram-widget.js?7"
             {$nonce_code}
@@ -191,31 +191,31 @@ 
     </script>
 </center>
 HTML
-        );
-    }
-
-    protected function authenticateFinish()
-    {
-        $this->logger->debug(
-            sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
-            [Util::getCurrentUrl(true)]
-        );
-
-        $this->storeData('auth_data', $this->parseAuthData());
-
-        $this->initialize();
-    }
-
-    protected function parseAuthData()
-    {
-        return [
-            'id' => filter_input(INPUT_GET, 'id'),
-            'first_name' => filter_input(INPUT_GET, 'first_name'),
-            'last_name' => filter_input(INPUT_GET, 'last_name'),
-            'username' => filter_input(INPUT_GET, 'username'),
-            'photo_url' => filter_input(INPUT_GET, 'photo_url'),
-            'auth_date' => filter_input(INPUT_GET, 'auth_date'),
-            'hash' => filter_input(INPUT_GET, 'hash'),
-        ];
-    }
+		);
+	}
+
+	protected function authenticateFinish()
+	{
+		$this->logger->debug(
+			sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
+			[Util::getCurrentUrl(true)]
+		);
+
+		$this->storeData('auth_data', $this->parseAuthData());
+
+		$this->initialize();
+	}
+
+	protected function parseAuthData()
+	{
+		return [
+			'id' => filter_input(INPUT_GET, 'id'),
+			'first_name' => filter_input(INPUT_GET, 'first_name'),
+			'last_name' => filter_input(INPUT_GET, 'last_name'),
+			'username' => filter_input(INPUT_GET, 'username'),
+			'photo_url' => filter_input(INPUT_GET, 'photo_url'),
+			'auth_date' => filter_input(INPUT_GET, 'auth_date'),
+			'hash' => filter_input(INPUT_GET, 'hash'),
+		];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -68,9 +68,9 @@ 
         $this->botSecret = $this->config->filter('keys')->get('secret');
         $this->callbackUrl = $this->config->get('callback');
 
-        if (!$this->botId || !$this->botSecret) {
+        if ( ! $this->botId || ! $this->botSecret) {
             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
             );
         }
     }
@@ -88,7 +88,7 @@ 
     public function authenticate()
     {
         $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-        if (!filter_input(INPUT_GET, 'hash')) {
+        if ( ! filter_input(INPUT_GET, 'hash')) {
             $this->authenticateBegin();
         } else {
             $this->authenticateCheckError();
@@ -103,7 +103,7 @@ 
     public function isConnected()
     {
         $authData = $this->getStoredData('auth_data');
-        return !empty($authData);
+        return ! empty($authData);
     }
 
     /**
@@ -113,7 +113,7 @@ 
     {
         $data = new Collection($this->getStoredData('auth_data'));
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -125,7 +125,7 @@ 
         $userProfile->displayName = $data->get('username');
         $userProfile->photoURL = $data->get('photo_url');
         $username = $data->get('username');
-        if (!empty($username)) {
+        if ( ! empty($username)) {
             // Only some accounts have usernames.
             $userProfile->profileURL = "https://t.me/{$username}";
         }
@@ -146,8 +146,8 @@ 
         $data_check_arr = [];
 
         foreach ($auth_data as $key => $value) {
-            if (!empty($value)) {
-                $data_check_arr[] = $key . '=' . $value;
+            if ( ! empty($value)) {
+                $data_check_arr[] = $key.'='.$value;
             }
         }
         sort($data_check_arr);