hybridauth / hybridauth

src/Provider/Authentiq.php

Indentation +91 added lines, -91 removed lines

@@ -17,95 +17,95 @@
  */
 class Authentiq extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'aq:name email~rs aq:push openid';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://connect.authentiq.io/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://connect.authentiq.io/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://connect.authentiq.io/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'http://developers.authentiq.io/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'prompt' => 'consent'
-        ];
-
-        $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-
-        $this->tokenRefreshHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-    }
-
-    /**
-     * {@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('name');
-        $userProfile->firstName = $data->get('given_name');
-        // $userProfile->middleName  = $data->get('middle_name'); // not supported
-        $userProfile->lastName = $data->get('family_name');
-
-        if (!empty($userProfile->displayName)) {
-            $userProfile->displayName = join(' ', array($userProfile->firstName,
-                // $userProfile->middleName,
-                $userProfile->lastName));
-        }
-
-        $userProfile->email = $data->get('email');
-        $userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
-
-        $userProfile->phone = $data->get('phone');
-        // $userProfile->phoneVerified = $data->get('phone_verified') ? $userProfile->phone : ''; // not supported
-
-        $userProfile->profileURL = $data->get('profile');
-        $userProfile->webSiteURL = $data->get('website');
-        $userProfile->photoURL = $data->get('picture');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->address = $data->filter('address')->get('street_address');
-        $userProfile->city = $data->filter('address')->get('locality');
-        $userProfile->country = $data->filter('address')->get('country');
-        $userProfile->region = $data->filter('address')->get('region');
-        $userProfile->zip = $data->filter('address')->get('postal_code');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'aq:name email~rs aq:push openid';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://connect.authentiq.io/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://connect.authentiq.io/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://connect.authentiq.io/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'http://developers.authentiq.io/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'prompt' => 'consent'
+		];
+
+		$this->tokenExchangeHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+
+		$this->tokenRefreshHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+	}
+
+	/**
+	 * {@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('name');
+		$userProfile->firstName = $data->get('given_name');
+		// $userProfile->middleName  = $data->get('middle_name'); // not supported
+		$userProfile->lastName = $data->get('family_name');
+
+		if (!empty($userProfile->displayName)) {
+			$userProfile->displayName = join(' ', array($userProfile->firstName,
+				// $userProfile->middleName,
+				$userProfile->lastName));
+		}
+
+		$userProfile->email = $data->get('email');
+		$userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
+
+		$userProfile->phone = $data->get('phone');
+		// $userProfile->phoneVerified = $data->get('phone_verified') ? $userProfile->phone : ''; // not supported
+
+		$userProfile->profileURL = $data->get('profile');
+		$userProfile->webSiteURL = $data->get('website');
+		$userProfile->photoURL = $data->get('picture');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->address = $data->filter('address')->get('street_address');
+		$userProfile->city = $data->filter('address')->get('locality');
+		$userProfile->country = $data->filter('address')->get('country');
+		$userProfile->region = $data->filter('address')->get('region');
+		$userProfile->zip = $data->filter('address')->get('postal_code');
+
+		return $userProfile;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -54,11 +54,11 @@ 
         ];
 
         $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+            'Authorization' => 'Basic '.base64_encode($this->clientId.':'.$this->clientSecret)
         ];
 
         $this->tokenRefreshHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+            'Authorization' => 'Basic '.base64_encode($this->clientId.':'.$this->clientSecret)
         ];
     }
 
@@ -71,7 +71,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('sub')) {
+        if ( ! $data->exists('sub')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -84,7 +84,7 @@ 
         // $userProfile->middleName  = $data->get('middle_name'); // not supported
         $userProfile->lastName = $data->get('family_name');
 
-        if (!empty($userProfile->displayName)) {
+        if ( ! empty($userProfile->displayName)) {
             $userProfile->displayName = join(' ', array($userProfile->firstName,
                 // $userProfile->middleName,
                 $userProfile->lastName));

src/Provider/SteemConnect.php

Indentation +39 added lines, -39 removed lines

@@ -17,54 +17,54 @@
  */
 class SteemConnect extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'login,vote';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'login,vote';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://v2.steemconnect.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://v2.steemconnect.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://v2.steemconnect.com/oauth2/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://v2.steemconnect.com/oauth2/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://v2.steemconnect.com/api/oauth2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://v2.steemconnect.com/api/oauth2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://steemconnect.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://steemconnect.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('api/me');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('api/me');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('result')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('result')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $data = $data->filter('result');
+		$data = $data->filter('result');
 
-        $userProfile->identifier = $data->get('id');
-        $userProfile->description = $data->get('about');
-        $userProfile->photoURL = $data->get('profile_image');
-        $userProfile->webSiteURL = $data->get('website');
-        $userProfile->displayName = $data->get('name');
+		$userProfile->identifier = $data->get('id');
+		$userProfile->description = $data->get('about');
+		$userProfile->photoURL = $data->get('profile_image');
+		$userProfile->webSiteURL = $data->get('website');
+		$userProfile->displayName = $data->get('name');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

src/Provider/Strava.php

Indentation +41 added lines, -41 removed lines

@@ -17,56 +17,56 @@
  */
 class Strava extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'profile:read_all';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'profile:read_all';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://www.strava.com/api/v3/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://www.strava.com/api/v3/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.strava.com/oauth/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.strava.com/oauth/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://www.strava.com/oauth/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://www.strava.com/oauth/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developers.strava.com/docs/reference/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developers.strava.com/docs/reference/';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('athlete');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('athlete');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $data->get('id');
-        $userProfile->firstName = $data->get('firstname');
-        $userProfile->lastName = $data->get('lastname');
-        $userProfile->gender = $data->get('sex');
-        $userProfile->country = $data->get('country');
-        $userProfile->city = $data->get('city');
-        $userProfile->email = $data->get('email');
+		$userProfile->identifier = $data->get('id');
+		$userProfile->firstName = $data->get('firstname');
+		$userProfile->lastName = $data->get('lastname');
+		$userProfile->gender = $data->get('sex');
+		$userProfile->country = $data->get('country');
+		$userProfile->city = $data->get('city');
+		$userProfile->email = $data->get('email');
 
-        $userProfile->displayName = $userProfile->displayName ?: $data->get('username');
+		$userProfile->displayName = $userProfile->displayName ?: $data->get('username');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

Spacing +1 added lines, -1 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.');
         }
 

src/Provider/Yahoo.php

Indentation +79 added lines, -79 removed lines

@@ -22,83 +22,83 @@
  */
 class Yahoo extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'profile';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.login.yahoo.com/openid/v1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://api.login.yahoo.com/oauth2/request_auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.login.yahoo.com/oauth2/get_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.yahoo.com/oauth2/guide/';
-
-    /**
-     * Currently authenticated user
-     */
-    protected $userId = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-
-        $this->tokenRefreshHeaders = $this->tokenExchangeHeaders;
-    }
-
-    /**
-     * {@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->firstName = $data->get('given_name');
-        $userProfile->lastName = $data->get('family_name');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->language = $data->get('locale');
-        $userProfile->email = $data->get('email');
-
-        $userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
-
-        $profileImages = $data->get('profile_images');
-        if ($this->config->get('photo_size')) {
-            $prop = 'image' . $this->config->get('photo_size');
-        } else {
-            $prop = 'image192';
-        }
-        $userProfile->photoURL = $profileImages->$prop;
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'profile';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.login.yahoo.com/openid/v1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://api.login.yahoo.com/oauth2/request_auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.login.yahoo.com/oauth2/get_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.yahoo.com/oauth2/guide/';
+
+	/**
+	 * Currently authenticated user
+	 */
+	protected $userId = null;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->tokenExchangeHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+
+		$this->tokenRefreshHeaders = $this->tokenExchangeHeaders;
+	}
+
+	/**
+	 * {@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->firstName = $data->get('given_name');
+		$userProfile->lastName = $data->get('family_name');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->language = $data->get('locale');
+		$userProfile->email = $data->get('email');
+
+		$userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
+
+		$profileImages = $data->get('profile_images');
+		if ($this->config->get('photo_size')) {
+			$prop = 'image' . $this->config->get('photo_size');
+		} else {
+			$prop = 'image192';
+		}
+		$userProfile->photoURL = $profileImages->$prop;
+
+		return $userProfile;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         parent::initialize();
 
         $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+            'Authorization' => 'Basic '.base64_encode($this->clientId.':'.$this->clientSecret)
         ];
 
         $this->tokenRefreshHeaders = $this->tokenExchangeHeaders;
@@ -75,7 +75,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('sub')) {
+        if ( ! $data->exists('sub')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -93,7 +93,7 @@ 
 
         $profileImages = $data->get('profile_images');
         if ($this->config->get('photo_size')) {
-            $prop = 'image' . $this->config->get('photo_size');
+            $prop = 'image'.$this->config->get('photo_size');
         } else {
             $prop = 'image192';
         }

src/Provider/Steam.php

Indentation +112 added lines, -112 removed lines

@@ -35,116 +35,116 @@
  */
 class Steam extends OpenID
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $openidIdentifier = 'http://steamcommunity.com/openid';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://steamcommunity.com/dev';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticateFinish()
-    {
-        parent::authenticateFinish();
-
-        $userProfile = $this->storage->get($this->providerId . '.user');
-
-        $userProfile->identifier = str_ireplace([
-            'http://steamcommunity.com/openid/id/',
-            'https://steamcommunity.com/openid/id/',
-        ], '', $userProfile->identifier);
-
-        if (!$userProfile->identifier) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        try {
-            $apiKey = $this->config->filter('keys')->get('secret');
-
-            // if api key is provided, we attempt to use steam web api
-            if ($apiKey) {
-                $result = $this->getUserProfileWebAPI($apiKey, $userProfile->identifier);
-            } else {
-                // otherwise we fallback to community data
-                $result = $this->getUserProfileLegacyAPI($userProfile->identifier);
-            }
-
-            // fetch user profile
-            foreach ($result as $k => $v) {
-                $userProfile->$k = $v ?: $userProfile->$k;
-            }
-        } catch (\Exception $e) {
-        }
-
-        // store user profile
-        $this->storage->set($this->providerId . '.user', $userProfile);
-    }
-
-    /**
-     * Fetch user profile on Steam web API
-     *
-     * @param $apiKey
-     * @param $steam64
-     *
-     * @return array
-     */
-    public function getUserProfileWebAPI($apiKey, $steam64)
-    {
-        $q = http_build_query(['key' => $apiKey, 'steamids' => $steam64]);
-        $apiUrl = 'http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?' . $q;
-
-        $response = $this->httpClient->request($apiUrl);
-
-        $data = json_decode($response);
-
-        $data = isset($data->response->players[0]) ? $data->response->players[0] : null;
-
-        $data = new Data\Collection($data);
-
-        $userProfile = [];
-
-        $userProfile['displayName'] = (string)$data->get('personaname');
-        $userProfile['firstName'] = (string)$data->get('realname');
-        $userProfile['photoURL'] = (string)$data->get('avatarfull');
-        $userProfile['profileURL'] = (string)$data->get('profileurl');
-        $userProfile['country'] = (string)$data->get('loccountrycode');
-
-        return $userProfile;
-    }
-
-    /**
-     * Fetch user profile on community API
-     * @param $steam64
-     * @return array
-     */
-    public function getUserProfileLegacyAPI($steam64)
-    {
-        libxml_use_internal_errors(false);
-
-        $apiUrl = 'http://steamcommunity.com/profiles/' . $steam64 . '/?xml=1';
-
-        $response = $this->httpClient->request($apiUrl);
-
-        $data = new \SimpleXMLElement($response);
-
-        $data = new Data\Collection($data);
-
-        $userProfile = [];
-
-        $userProfile['displayName'] = (string)$data->get('steamID');
-        $userProfile['firstName'] = (string)$data->get('realname');
-        $userProfile['photoURL'] = (string)$data->get('avatarFull');
-        $userProfile['description'] = (string)$data->get('summary');
-        $userProfile['region'] = (string)$data->get('location');
-        $userProfile['profileURL'] = (string)$data->get('customURL')
-            ? 'http://steamcommunity.com/id/' . (string)$data->get('customURL')
-            : 'http://steamcommunity.com/profiles/' . $steam64;
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $openidIdentifier = 'http://steamcommunity.com/openid';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://steamcommunity.com/dev';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticateFinish()
+	{
+		parent::authenticateFinish();
+
+		$userProfile = $this->storage->get($this->providerId . '.user');
+
+		$userProfile->identifier = str_ireplace([
+			'http://steamcommunity.com/openid/id/',
+			'https://steamcommunity.com/openid/id/',
+		], '', $userProfile->identifier);
+
+		if (!$userProfile->identifier) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		try {
+			$apiKey = $this->config->filter('keys')->get('secret');
+
+			// if api key is provided, we attempt to use steam web api
+			if ($apiKey) {
+				$result = $this->getUserProfileWebAPI($apiKey, $userProfile->identifier);
+			} else {
+				// otherwise we fallback to community data
+				$result = $this->getUserProfileLegacyAPI($userProfile->identifier);
+			}
+
+			// fetch user profile
+			foreach ($result as $k => $v) {
+				$userProfile->$k = $v ?: $userProfile->$k;
+			}
+		} catch (\Exception $e) {
+		}
+
+		// store user profile
+		$this->storage->set($this->providerId . '.user', $userProfile);
+	}
+
+	/**
+	 * Fetch user profile on Steam web API
+	 *
+	 * @param $apiKey
+	 * @param $steam64
+	 *
+	 * @return array
+	 */
+	public function getUserProfileWebAPI($apiKey, $steam64)
+	{
+		$q = http_build_query(['key' => $apiKey, 'steamids' => $steam64]);
+		$apiUrl = 'http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?' . $q;
+
+		$response = $this->httpClient->request($apiUrl);
+
+		$data = json_decode($response);
+
+		$data = isset($data->response->players[0]) ? $data->response->players[0] : null;
+
+		$data = new Data\Collection($data);
+
+		$userProfile = [];
+
+		$userProfile['displayName'] = (string)$data->get('personaname');
+		$userProfile['firstName'] = (string)$data->get('realname');
+		$userProfile['photoURL'] = (string)$data->get('avatarfull');
+		$userProfile['profileURL'] = (string)$data->get('profileurl');
+		$userProfile['country'] = (string)$data->get('loccountrycode');
+
+		return $userProfile;
+	}
+
+	/**
+	 * Fetch user profile on community API
+	 * @param $steam64
+	 * @return array
+	 */
+	public function getUserProfileLegacyAPI($steam64)
+	{
+		libxml_use_internal_errors(false);
+
+		$apiUrl = 'http://steamcommunity.com/profiles/' . $steam64 . '/?xml=1';
+
+		$response = $this->httpClient->request($apiUrl);
+
+		$data = new \SimpleXMLElement($response);
+
+		$data = new Data\Collection($data);
+
+		$userProfile = [];
+
+		$userProfile['displayName'] = (string)$data->get('steamID');
+		$userProfile['firstName'] = (string)$data->get('realname');
+		$userProfile['photoURL'] = (string)$data->get('avatarFull');
+		$userProfile['description'] = (string)$data->get('summary');
+		$userProfile['region'] = (string)$data->get('location');
+		$userProfile['profileURL'] = (string)$data->get('customURL')
+			? 'http://steamcommunity.com/id/' . (string)$data->get('customURL')
+			: 'http://steamcommunity.com/profiles/' . $steam64;
+
+		return $userProfile;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -52,14 +52,14 @@ 
     {
         parent::authenticateFinish();
 
-        $userProfile = $this->storage->get($this->providerId . '.user');
+        $userProfile = $this->storage->get($this->providerId.'.user');
 
         $userProfile->identifier = str_ireplace([
             'http://steamcommunity.com/openid/id/',
             'https://steamcommunity.com/openid/id/',
         ], '', $userProfile->identifier);
 
-        if (!$userProfile->identifier) {
+        if ( ! $userProfile->identifier) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -82,7 +82,7 @@ 
         }
 
         // store user profile
-        $this->storage->set($this->providerId . '.user', $userProfile);
+        $this->storage->set($this->providerId.'.user', $userProfile);
     }
 
     /**
@@ -96,7 +96,7 @@ 
     public function getUserProfileWebAPI($apiKey, $steam64)
     {
         $q = http_build_query(['key' => $apiKey, 'steamids' => $steam64]);
-        $apiUrl = 'http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?' . $q;
+        $apiUrl = 'http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?'.$q;
 
         $response = $this->httpClient->request($apiUrl);
 
@@ -108,11 +108,11 @@ 
 
         $userProfile = [];
 
-        $userProfile['displayName'] = (string)$data->get('personaname');
-        $userProfile['firstName'] = (string)$data->get('realname');
-        $userProfile['photoURL'] = (string)$data->get('avatarfull');
-        $userProfile['profileURL'] = (string)$data->get('profileurl');
-        $userProfile['country'] = (string)$data->get('loccountrycode');
+        $userProfile['displayName'] = (string) $data->get('personaname');
+        $userProfile['firstName'] = (string) $data->get('realname');
+        $userProfile['photoURL'] = (string) $data->get('avatarfull');
+        $userProfile['profileURL'] = (string) $data->get('profileurl');
+        $userProfile['country'] = (string) $data->get('loccountrycode');
 
         return $userProfile;
     }
@@ -126,7 +126,7 @@ 
     {
         libxml_use_internal_errors(false);
 
-        $apiUrl = 'http://steamcommunity.com/profiles/' . $steam64 . '/?xml=1';
+        $apiUrl = 'http://steamcommunity.com/profiles/'.$steam64.'/?xml=1';
 
         $response = $this->httpClient->request($apiUrl);
 
@@ -136,14 +136,14 @@ 
 
         $userProfile = [];
 
-        $userProfile['displayName'] = (string)$data->get('steamID');
-        $userProfile['firstName'] = (string)$data->get('realname');
-        $userProfile['photoURL'] = (string)$data->get('avatarFull');
-        $userProfile['description'] = (string)$data->get('summary');
-        $userProfile['region'] = (string)$data->get('location');
-        $userProfile['profileURL'] = (string)$data->get('customURL')
-            ? 'http://steamcommunity.com/id/' . (string)$data->get('customURL')
-            : 'http://steamcommunity.com/profiles/' . $steam64;
+        $userProfile['displayName'] = (string) $data->get('steamID');
+        $userProfile['firstName'] = (string) $data->get('realname');
+        $userProfile['photoURL'] = (string) $data->get('avatarFull');
+        $userProfile['description'] = (string) $data->get('summary');
+        $userProfile['region'] = (string) $data->get('location');
+        $userProfile['profileURL'] = (string) $data->get('customURL')
+            ? 'http://steamcommunity.com/id/'.(string) $data->get('customURL')
+            : 'http://steamcommunity.com/profiles/'.$steam64;
 
         return $userProfile;
     }

src/Provider/DeviantArt.php

Indentation +59 added lines, -59 removed lines

@@ -17,75 +17,75 @@
  */
 class DeviantArt extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'user';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'user';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://www.deviantart.com/api/v1/oauth2/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://www.deviantart.com/api/v1/oauth2/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.deviantart.com/oauth2/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.deviantart.com/oauth2/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://www.deviantart.com/oauth2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://www.deviantart.com/oauth2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://www.deviantart.com/developers/http/v1/20200519';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://www.deviantart.com/developers/http/v1/20200519';
 
-    /**
-     * {@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://www.deviantart.com/developers/http/v1/20200519/user_whoami/2413749853e66c5812c9beccc0ab3495
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('user/whoami');
+	/**
+	 * {@inheritdoc}
+	 *
+	 * See: https://www.deviantart.com/developers/http/v1/20200519/user_whoami/2413749853e66c5812c9beccc0ab3495
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('user/whoami');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $full_name = explode(' ', $data->filter('profile')->get('real_name'));
-        if (count($full_name) < 2) {
-            $full_name[1] = '';
-        }
+		$full_name = explode(' ', $data->filter('profile')->get('real_name'));
+		if (count($full_name) < 2) {
+			$full_name[1] = '';
+		}
 
-        $userProfile->identifier = $data->get('userid');
-        $userProfile->displayName = $data->get('username');
-        $userProfile->profileURL = $data->get('usericon');
-        $userProfile->webSiteURL = $data->filter('profile')->get('website');
-        $userProfile->firstName = $full_name[0];
-        $userProfile->lastName = $full_name[1];
-        $userProfile->profileURL = $data->filter('profile')->filter('profile_pic')->get('url');
-        $userProfile->gender = $data->filter('details')->get('sex');
-        $userProfile->age = $data->filter('details')->get('age');
-        $userProfile->country = $data->filter('geo')->get('country');
+		$userProfile->identifier = $data->get('userid');
+		$userProfile->displayName = $data->get('username');
+		$userProfile->profileURL = $data->get('usericon');
+		$userProfile->webSiteURL = $data->filter('profile')->get('website');
+		$userProfile->firstName = $full_name[0];
+		$userProfile->lastName = $full_name[1];
+		$userProfile->profileURL = $data->filter('profile')->filter('profile_pic')->get('url');
+		$userProfile->gender = $data->filter('details')->get('sex');
+		$userProfile->age = $data->filter('details')->get('age');
+		$userProfile->country = $data->filter('geo')->get('country');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/WindowsLive.php

Indentation +83 added lines, -83 removed lines

@@ -17,87 +17,87 @@
  */
 class WindowsLive extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'wl.basic wl.contacts_emails wl.emails wl.signin wl.share wl.birthday';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://apis.live.net/v5.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://login.live.com/oauth20_authorize.srf';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://login.live.com/oauth20_token.srf';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://msdn.microsoft.com/en-us/library/hh243647.aspx';
-
-    /**
-     * {@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('name');
-        $userProfile->firstName = $data->get('first_name');
-        $userProfile->lastName = $data->get('last_name');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->profileURL = $data->get('link');
-        $userProfile->email = $data->filter('emails')->get('preferred');
-        $userProfile->emailVerified = $data->filter('emails')->get('account');
-        $userProfile->birthDay = $data->get('birth_day');
-        $userProfile->birthMonth = $data->get('birth_month');
-        $userProfile->birthYear = $data->get('birth_year');
-        $userProfile->language = $data->get('locale');
-
-        return $userProfile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts()
-    {
-        $response = $this->apiRequest('me/contacts');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('data')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $contacts = [];
-
-        foreach ($data->filter('data')->toArray() as $idx => $entry) {
-            $userContact = new User\Contact();
-
-            $userContact->identifier = $entry->get('id');
-            $userContact->displayName = $entry->get('name');
-            $userContact->email = $entry->filter('emails')->get('preferred');
-
-            $contacts[] = $userContact;
-        }
-
-        return $contacts;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'wl.basic wl.contacts_emails wl.emails wl.signin wl.share wl.birthday';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://apis.live.net/v5.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://login.live.com/oauth20_authorize.srf';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://login.live.com/oauth20_token.srf';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://msdn.microsoft.com/en-us/library/hh243647.aspx';
+
+	/**
+	 * {@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('name');
+		$userProfile->firstName = $data->get('first_name');
+		$userProfile->lastName = $data->get('last_name');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->profileURL = $data->get('link');
+		$userProfile->email = $data->filter('emails')->get('preferred');
+		$userProfile->emailVerified = $data->filter('emails')->get('account');
+		$userProfile->birthDay = $data->get('birth_day');
+		$userProfile->birthMonth = $data->get('birth_month');
+		$userProfile->birthYear = $data->get('birth_year');
+		$userProfile->language = $data->get('locale');
+
+		return $userProfile;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts()
+	{
+		$response = $this->apiRequest('me/contacts');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('data')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$contacts = [];
+
+		foreach ($data->filter('data')->toArray() as $idx => $entry) {
+			$userContact = new User\Contact();
+
+			$userContact->identifier = $entry->get('id');
+			$userContact->displayName = $entry->get('name');
+			$userContact->email = $entry->filter('emails')->get('preferred');
+
+			$contacts[] = $userContact;
+		}
+
+		return $contacts;
+	}
 }

Spacing +2 added lines, -2 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.');
         }
 
@@ -82,7 +82,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('data')) {
+        if ( ! $data->exists('data')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 

src/Provider/Disqus.php

Indentation +68 added lines, -68 removed lines

@@ -17,72 +17,72 @@
  */
 class Disqus extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'read,email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://disqus.com/api/3.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://disqus.com/api/oauth/2.0/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://disqus.com/api/oauth/2.0/access_token/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://disqus.com/api/docs/auth/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->apiRequestParameters = [
-            'api_key' => $this->clientId, 'api_secret' => $this->clientSecret
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('users/details');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->filter('response')->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $data = $data->filter('response');
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->description = $data->get('bio');
-        $userProfile->profileURL = $data->get('profileUrl');
-        $userProfile->email = $data->get('email');
-        $userProfile->region = $data->get('location');
-        $userProfile->description = $data->get('about');
-
-        $userProfile->photoURL = $data->filter('avatar')->get('permalink');
-
-        $userProfile->displayName = $userProfile->displayName ?: $data->get('username');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'read,email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://disqus.com/api/3.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://disqus.com/api/oauth/2.0/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://disqus.com/api/oauth/2.0/access_token/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://disqus.com/api/docs/auth/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->apiRequestParameters = [
+			'api_key' => $this->clientId, 'api_secret' => $this->clientSecret
+		];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('users/details');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->filter('response')->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$data = $data->filter('response');
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->description = $data->get('bio');
+		$userProfile->profileURL = $data->get('profileUrl');
+		$userProfile->email = $data->get('email');
+		$userProfile->region = $data->get('location');
+		$userProfile->description = $data->get('about');
+
+		$userProfile->photoURL = $data->filter('avatar')->get('permalink');
+
+		$userProfile->displayName = $userProfile->displayName ?: $data->get('username');
+
+		return $userProfile;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

src/Provider/PaypalOpenID.php

Indentation +50 added lines, -50 removed lines

@@ -15,57 +15,57 @@
  */
 class PaypalOpenID extends OpenID
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $openidIdentifier = 'https://www.sandbox.paypal.com/webapps/auth/server';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $openidIdentifier = 'https://www.sandbox.paypal.com/webapps/auth/server';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.paypal.com/docs/connect-with-paypal/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.paypal.com/docs/connect-with-paypal/';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticateBegin()
-    {
-        $this->openIdClient->identity = $this->openidIdentifier;
-        $this->openIdClient->returnUrl = $this->callback;
-        $this->openIdClient->required = [
-            'namePerson/prefix',
-            'namePerson/first',
-            'namePerson/last',
-            'namePerson/middle',
-            'namePerson/suffix',
-            'namePerson/friendly',
-            'person/guid',
-            'birthDate/birthYear',
-            'birthDate/birthMonth',
-            'birthDate/birthday',
-            'gender',
-            'language/pref',
-            'contact/phone/default',
-            'contact/phone/home',
-            'contact/phone/business',
-            'contact/phone/cell',
-            'contact/phone/fax',
-            'contact/postaladdress/home',
-            'contact/postaladdressadditional/home',
-            'contact/city/home',
-            'contact/state/home',
-            'contact/country/home',
-            'contact/postalcode/home',
-            'contact/postaladdress/business',
-            'contact/postaladdressadditional/business',
-            'contact/city/business',
-            'contact/state/business',
-            'contact/country/business',
-            'contact/postalcode/business',
-            'company/name',
-            'company/title',
-        ];
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticateBegin()
+	{
+		$this->openIdClient->identity = $this->openidIdentifier;
+		$this->openIdClient->returnUrl = $this->callback;
+		$this->openIdClient->required = [
+			'namePerson/prefix',
+			'namePerson/first',
+			'namePerson/last',
+			'namePerson/middle',
+			'namePerson/suffix',
+			'namePerson/friendly',
+			'person/guid',
+			'birthDate/birthYear',
+			'birthDate/birthMonth',
+			'birthDate/birthday',
+			'gender',
+			'language/pref',
+			'contact/phone/default',
+			'contact/phone/home',
+			'contact/phone/business',
+			'contact/phone/cell',
+			'contact/phone/fax',
+			'contact/postaladdress/home',
+			'contact/postaladdressadditional/home',
+			'contact/city/home',
+			'contact/state/home',
+			'contact/country/home',
+			'contact/postalcode/home',
+			'contact/postaladdress/business',
+			'contact/postaladdressadditional/business',
+			'contact/city/business',
+			'contact/state/business',
+			'contact/country/business',
+			'contact/postalcode/business',
+			'company/name',
+			'company/title',
+		];
 
-        HttpClient\Util::redirect($this->openIdClient->authUrl());
-    }
+		HttpClient\Util::redirect($this->openIdClient->authUrl());
+	}
 }