hybridauth / hybridauth

src/HttpClient/HttpClientInterface.php

Indentation +39 added lines, -39 removed lines

@@ -12,47 +12,47 @@
  */
 interface HttpClientInterface
 {
-    /**
-     * Send request to the remote server
-     *
-     * Returns the result (Raw response from the server) on success, FALSE on failure
-     *
-     * @param string $uri
-     * @param string $method
-     * @param array $parameters
-     * @param array $headers
-     * @param bool $multipart
-     *
-     * @return mixed
-     */
-    public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false);
+	/**
+	 * Send request to the remote server
+	 *
+	 * Returns the result (Raw response from the server) on success, FALSE on failure
+	 *
+	 * @param string $uri
+	 * @param string $method
+	 * @param array $parameters
+	 * @param array $headers
+	 * @param bool $multipart
+	 *
+	 * @return mixed
+	 */
+	public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false);
 
-    /**
-     * Returns raw response from the server on success, FALSE on failure
-     *
-     * @return mixed
-     */
-    public function getResponseBody();
+	/**
+	 * Returns raw response from the server on success, FALSE on failure
+	 *
+	 * @return mixed
+	 */
+	public function getResponseBody();
 
-    /**
-     * Retriever the headers returned in the response
-     *
-     * @return array
-     */
-    public function getResponseHeader();
+	/**
+	 * Retriever the headers returned in the response
+	 *
+	 * @return array
+	 */
+	public function getResponseHeader();
 
-    /**
-     * Returns latest request HTTP status code
-     *
-     * @return int
-     */
-    public function getResponseHttpCode();
+	/**
+	 * Returns latest request HTTP status code
+	 *
+	 * @return int
+	 */
+	public function getResponseHttpCode();
 
-    /**
-     * Returns latest error encountered by the client
-     * This can be either a code or error message
-     *
-     * @return mixed
-     */
-    public function getResponseClientError();
+	/**
+	 * Returns latest error encountered by the client
+	 * This can be either a code or error message
+	 *
+	 * @return mixed
+	 */
+	public function getResponseClientError();
 }

src/HttpClient/Util.php

Indentation +72 added lines, -72 removed lines

@@ -14,87 +14,87 @@
  */
 class Util
 {
-    /**
-     * Redirect handler.
-     *
-     * @var callable|null
-     */
-    protected static $redirectHandler;
+	/**
+	 * Redirect handler.
+	 *
+	 * @var callable|null
+	 */
+	protected static $redirectHandler;
 
-    /**
-     * Exit handler.
-     *
-     * @var callable|null
-     */
-    protected static $exitHandler;
+	/**
+	 * Exit handler.
+	 *
+	 * @var callable|null
+	 */
+	protected static $exitHandler;
 
-    /**
-     * Redirect to a given URL.
-     *
-     * In case your application need to perform certain required actions before Hybridauth redirect users
-     * to IDPs websites, the default behaviour can be altered in one of two ways:
-     *   If callable $redirectHandler is defined, it will be called instead.
-     *   If callable $exitHandler is defined, it will be called instead of exit().
-     *
-     * @param string $url
-     *
-     * @return mixed
-     */
-    public static function redirect($url)
-    {
-        if (static::$redirectHandler) {
-            return call_user_func(static::$redirectHandler, $url);
-        }
+	/**
+	 * Redirect to a given URL.
+	 *
+	 * In case your application need to perform certain required actions before Hybridauth redirect users
+	 * to IDPs websites, the default behaviour can be altered in one of two ways:
+	 *   If callable $redirectHandler is defined, it will be called instead.
+	 *   If callable $exitHandler is defined, it will be called instead of exit().
+	 *
+	 * @param string $url
+	 *
+	 * @return mixed
+	 */
+	public static function redirect($url)
+	{
+		if (static::$redirectHandler) {
+			return call_user_func(static::$redirectHandler, $url);
+		}
 
-        header(sprintf('Location: %s', $url));
+		header(sprintf('Location: %s', $url));
 
-        if (static::$exitHandler) {
-            return call_user_func(static::$exitHandler);
-        }
+		if (static::$exitHandler) {
+			return call_user_func(static::$exitHandler);
+		}
 
-        exit(1);
-    }
+		exit(1);
+	}
 
-    /**
-     * Redirect handler to which the regular redirect() will yield the action of redirecting users.
-     *
-     * @param callable $callback
-     */
-    public static function setRedirectHandler($callback)
-    {
-        self::$redirectHandler = $callback;
-    }
+	/**
+	 * Redirect handler to which the regular redirect() will yield the action of redirecting users.
+	 *
+	 * @param callable $callback
+	 */
+	public static function setRedirectHandler($callback)
+	{
+		self::$redirectHandler = $callback;
+	}
 
-    /**
-     * Exit handler will be called instead of regular exit() when calling Util::redirect() method.
-     *
-     * @param callable $callback
-     */
-    public static function setExitHandler($callback)
-    {
-        self::$exitHandler = $callback;
-    }
+	/**
+	 * Exit handler will be called instead of regular exit() when calling Util::redirect() method.
+	 *
+	 * @param callable $callback
+	 */
+	public static function setExitHandler($callback)
+	{
+		self::$exitHandler = $callback;
+	}
 
-    /**
-     * Returns the Current URL.
-     *
-     * @param bool $requestUri TRUE to use $_SERVER['REQUEST_URI'], FALSE for $_SERVER['PHP_SELF']
-     *
-     * @return string
-     */
-    public static function getCurrentUrl($requestUri = false)
-    {
-        $collection = new Data\Collection($_SERVER);
+	/**
+	 * Returns the Current URL.
+	 *
+	 * @param bool $requestUri TRUE to use $_SERVER['REQUEST_URI'], FALSE for $_SERVER['PHP_SELF']
+	 *
+	 * @return string
+	 */
+	public static function getCurrentUrl($requestUri = false)
+	{
+		$collection = new Data\Collection($_SERVER);
 
-        $protocol = 'http://';
+		$protocol = 'http://';
 
-        if (($collection->get('HTTPS') && $collection->get('HTTPS') !== 'off') ||
-            $collection->get('HTTP_X_FORWARDED_PROTO') === 'https') {
-            $protocol = 'https://';
-        }
+		if (($collection->get('HTTPS') && $collection->get('HTTPS') !== 'off') ||
+			$collection->get('HTTP_X_FORWARDED_PROTO') === 'https') {
+			$protocol = 'https://';
+		}
 
-        return $protocol .
-            $collection->get('HTTP_HOST') .
-            $collection->get($requestUri ? 'REQUEST_URI' : 'PHP_SELF');
-    }
+		return $protocol .
+			$collection->get('HTTP_HOST') .
+			$collection->get($requestUri ? 'REQUEST_URI' : 'PHP_SELF');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
             $protocol = 'https://';
         }
 
-        return $protocol .
-            $collection->get('HTTP_HOST') .
+        return $protocol.
+            $collection->get('HTTP_HOST').
             $collection->get($requestUri ? 'REQUEST_URI' : 'PHP_SELF');
     }
 }

src/Provider/Paypal.php

Indentation +93 added lines, -93 removed lines

@@ -17,97 +17,97 @@
  */
 class Paypal extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'openid profile email address';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.paypal.com/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.paypal.com/signin/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.paypal.com/v1/oauth2/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.paypal.com/docs/api/overview/#';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'flowEntry' => 'static'
-        ];
-
-        $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-
-        $this->tokenRefreshHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * See: https://developer.paypal.com/docs/api/identity/v1/
-     * See: https://developer.paypal.com/docs/connect-with-paypal/integrate/
-     */
-    public function getUserProfile()
-    {
-        $headers = [
-            'Content-Type' => 'application/json',
-        ];
-
-        $parameters = [
-            'schema' => 'paypalv1.1'
-        ];
-
-        $response = $this->apiRequest('v1/identity/oauth2/userinfo', 'GET', $parameters, $headers);
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('user_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-        $userProfile->identifier = $data->get('user_id');
-        $userProfile->firstName = $data->get('given_name');
-        $userProfile->lastName = $data->get('family_name');
-        $userProfile->displayName = $data->get('name');
-        $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');
-
-        $emails = $data->filter('emails')->toArray();
-        foreach ($emails as $email) {
-            $email = new Data\Collection($email);
-            if ($email->get('confirmed')) {
-                $userProfile->emailVerified = $email->get('value');
-            }
-
-            if ($email->get('primary')) {
-                $userProfile->email = $email->get('value');
-            }
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'openid profile email address';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.paypal.com/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.paypal.com/signin/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.paypal.com/v1/oauth2/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.paypal.com/docs/api/overview/#';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'flowEntry' => 'static'
+		];
+
+		$this->tokenExchangeHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+
+		$this->tokenRefreshHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * See: https://developer.paypal.com/docs/api/identity/v1/
+	 * See: https://developer.paypal.com/docs/connect-with-paypal/integrate/
+	 */
+	public function getUserProfile()
+	{
+		$headers = [
+			'Content-Type' => 'application/json',
+		];
+
+		$parameters = [
+			'schema' => 'paypalv1.1'
+		];
+
+		$response = $this->apiRequest('v1/identity/oauth2/userinfo', 'GET', $parameters, $headers);
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('user_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+		$userProfile->identifier = $data->get('user_id');
+		$userProfile->firstName = $data->get('given_name');
+		$userProfile->lastName = $data->get('family_name');
+		$userProfile->displayName = $data->get('name');
+		$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');
+
+		$emails = $data->filter('emails')->toArray();
+		foreach ($emails as $email) {
+			$email = new Data\Collection($email);
+			if ($email->get('confirmed')) {
+				$userProfile->emailVerified = $email->get('value');
+			}
+
+			if ($email->get('primary')) {
+				$userProfile->email = $email->get('value');
+			}
+		}
+
+		return $userProfile;
+	}
 }

Spacing +3 added lines, -3 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)
         ];
     }
 
@@ -81,7 +81,7 @@ 
         $response = $this->apiRequest('v1/identity/oauth2/userinfo', 'GET', $parameters, $headers);
         $data = new Data\Collection($response);
 
-        if (!$data->exists('user_id')) {
+        if ( ! $data->exists('user_id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 

src/Provider/Dribbble.php

Indentation +37 added lines, -37 removed lines

@@ -17,52 +17,52 @@
  */
 class Dribbble extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.dribbble.com/v2/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.dribbble.com/v2/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://dribbble.com/oauth/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://dribbble.com/oauth/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://dribbble.com/oauth/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://dribbble.com/oauth/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'http://developer.dribbble.com/v2/oauth/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'http://developer.dribbble.com/v2/oauth/';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('user');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('user');
 
-        $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->profileURL = $data->get('html_url');
-        $userProfile->photoURL = $data->get('avatar_url');
-        $userProfile->description = $data->get('bio');
-        $userProfile->region = $data->get('location');
-        $userProfile->displayName = $data->get('name');
+		$userProfile->identifier = $data->get('id');
+		$userProfile->profileURL = $data->get('html_url');
+		$userProfile->photoURL = $data->get('avatar_url');
+		$userProfile->description = $data->get('bio');
+		$userProfile->region = $data->get('location');
+		$userProfile->displayName = $data->get('name');
 
-        $userProfile->displayName = $userProfile->displayName ?: $data->get('username');
+		$userProfile->displayName = $userProfile->displayName ?: $data->get('username');
 
-        $userProfile->webSiteURL = $data->filter('links')->get('web');
+		$userProfile->webSiteURL = $data->filter('links')->get('web');
 
-        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/ORCID.php

Indentation +222 added lines, -222 removed lines

@@ -17,226 +17,226 @@
  */
 class ORCID extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = '/authenticate';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://pub.orcid.org/v2.1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://orcid.org/oauth/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://orcid.org/oauth/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://members.orcid.org/api/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $data = parent::validateAccessTokenExchange($response);
-        $this->storeData('orcid', $data->get('orcid'));
-        return $data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest($this->getStoredData('orcid') . '/record');
-        $data = new Data\Collection($response['record']);
-
-        if (!$data->exists('orcid-identifier')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $profile = new User\Profile();
-
-        $profile = $this->getDetails($profile, $data);
-        $profile = $this->getBiography($profile, $data);
-        $profile = $this->getWebsite($profile, $data);
-        $profile = $this->getName($profile, $data);
-        $profile = $this->getEmail($profile, $data);
-        $profile = $this->getLanguage($profile, $data);
-        $profile = $this->getAddress($profile, $data);
-
-        return $profile;
-    }
-
-    /**
-     * Get profile details.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getDetails(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('orcid-identifier'));
-
-        $profile->identifier = $data->get('path');
-        $profile->profileURL = $data->get('uri');
-
-        return $profile;
-    }
-
-    /**
-     * Get profile biography.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getBiography(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('person'));
-        $data = new Data\Collection($data->get('biography'));
-
-        $profile->description = $data->get('content');
-
-        return $profile;
-    }
-
-    /**
-     * Get profile website.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getWebsite(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('person'));
-        $data = new Data\Collection($data->get('researcher-urls'));
-        $data = new Data\Collection($data->get('researcher-url'));
-
-        if ($data->exists(0)) {
-            $data = new Data\Collection($data->get(0));
-        }
-
-        $profile->webSiteURL = $data->get('url');
-
-        return $profile;
-    }
-
-    /**
-     * Get profile name.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getName(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('person'));
-        $data = new Data\Collection($data->get('name'));
-
-        if ($data->exists('credit-name')) {
-            $profile->displayName = $data->get('credit-name');
-        } else {
-            $profile->displayName = $data->get('given-names') . ' ' . $data->get('family-name');
-        }
-
-        $profile->firstName = $data->get('given-names');
-        $profile->lastName = $data->get('family-name');
-
-        return $profile;
-    }
-
-    /**
-     * Get profile email.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getEmail(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('person'));
-        $data = new Data\Collection($data->get('emails'));
-        $data = new Data\Collection($data->get('email'));
-
-        if (!$data->exists(0)) {
-            $email = $data;
-        } else {
-            $email = new Data\Collection($data->get(0));
-
-            $i = 1;
-            while ($email->get('@attributes')['primary'] == 'false') {
-                $email = new Data\Collection($data->get($i));
-                $i++;
-            }
-        }
-
-        if ($email->get('@attributes')['primary'] == 'false') {
-            return $profile;
-        }
-
-        $profile->email = $email->get('email');
-
-        if ($email->get('@attributes')['verified'] == 'true') {
-            $profile->emailVerified = $email->get('email');
-        }
-
-        return $profile;
-    }
-
-    /**
-     * Get profile language.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getLanguage(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('preferences'));
-
-        $profile->language = $data->get('locale');
-
-        return $profile;
-    }
-
-    /**
-     * Get profile address.
-     *
-     * @param User\Profile $profile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function getAddress(User\Profile $profile, Data\Collection $data)
-    {
-        $data = new Data\Collection($data->get('person'));
-        $data = new Data\Collection($data->get('addresses'));
-        $data = new Data\Collection($data->get('address'));
-
-        if ($data->exists(0)) {
-            $data = new Data\Collection($data->get(0));
-        }
-
-        $profile->country = $data->get('country');
-
-        return $profile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = '/authenticate';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://pub.orcid.org/v2.1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://orcid.org/oauth/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://orcid.org/oauth/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://members.orcid.org/api/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$data = parent::validateAccessTokenExchange($response);
+		$this->storeData('orcid', $data->get('orcid'));
+		return $data;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest($this->getStoredData('orcid') . '/record');
+		$data = new Data\Collection($response['record']);
+
+		if (!$data->exists('orcid-identifier')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$profile = new User\Profile();
+
+		$profile = $this->getDetails($profile, $data);
+		$profile = $this->getBiography($profile, $data);
+		$profile = $this->getWebsite($profile, $data);
+		$profile = $this->getName($profile, $data);
+		$profile = $this->getEmail($profile, $data);
+		$profile = $this->getLanguage($profile, $data);
+		$profile = $this->getAddress($profile, $data);
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile details.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getDetails(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('orcid-identifier'));
+
+		$profile->identifier = $data->get('path');
+		$profile->profileURL = $data->get('uri');
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile biography.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getBiography(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('person'));
+		$data = new Data\Collection($data->get('biography'));
+
+		$profile->description = $data->get('content');
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile website.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getWebsite(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('person'));
+		$data = new Data\Collection($data->get('researcher-urls'));
+		$data = new Data\Collection($data->get('researcher-url'));
+
+		if ($data->exists(0)) {
+			$data = new Data\Collection($data->get(0));
+		}
+
+		$profile->webSiteURL = $data->get('url');
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile name.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getName(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('person'));
+		$data = new Data\Collection($data->get('name'));
+
+		if ($data->exists('credit-name')) {
+			$profile->displayName = $data->get('credit-name');
+		} else {
+			$profile->displayName = $data->get('given-names') . ' ' . $data->get('family-name');
+		}
+
+		$profile->firstName = $data->get('given-names');
+		$profile->lastName = $data->get('family-name');
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile email.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getEmail(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('person'));
+		$data = new Data\Collection($data->get('emails'));
+		$data = new Data\Collection($data->get('email'));
+
+		if (!$data->exists(0)) {
+			$email = $data;
+		} else {
+			$email = new Data\Collection($data->get(0));
+
+			$i = 1;
+			while ($email->get('@attributes')['primary'] == 'false') {
+				$email = new Data\Collection($data->get($i));
+				$i++;
+			}
+		}
+
+		if ($email->get('@attributes')['primary'] == 'false') {
+			return $profile;
+		}
+
+		$profile->email = $email->get('email');
+
+		if ($email->get('@attributes')['verified'] == 'true') {
+			$profile->emailVerified = $email->get('email');
+		}
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile language.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getLanguage(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('preferences'));
+
+		$profile->language = $data->get('locale');
+
+		return $profile;
+	}
+
+	/**
+	 * Get profile address.
+	 *
+	 * @param User\Profile $profile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function getAddress(User\Profile $profile, Data\Collection $data)
+	{
+		$data = new Data\Collection($data->get('person'));
+		$data = new Data\Collection($data->get('addresses'));
+		$data = new Data\Collection($data->get('address'));
+
+		if ($data->exists(0)) {
+			$data = new Data\Collection($data->get(0));
+		}
+
+		$profile->country = $data->get('country');
+
+		return $profile;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -57,10 +57,10 @@ 
      */
     public function getUserProfile()
     {
-        $response = $this->apiRequest($this->getStoredData('orcid') . '/record');
+        $response = $this->apiRequest($this->getStoredData('orcid').'/record');
         $data = new Data\Collection($response['record']);
 
-        if (!$data->exists('orcid-identifier')) {
+        if ( ! $data->exists('orcid-identifier')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -152,7 +152,7 @@ 
         if ($data->exists('credit-name')) {
             $profile->displayName = $data->get('credit-name');
         } else {
-            $profile->displayName = $data->get('given-names') . ' ' . $data->get('family-name');
+            $profile->displayName = $data->get('given-names').' '.$data->get('family-name');
         }
 
         $profile->firstName = $data->get('given-names');
@@ -175,7 +175,7 @@ 
         $data = new Data\Collection($data->get('emails'));
         $data = new Data\Collection($data->get('email'));
 
-        if (!$data->exists(0)) {
+        if ( ! $data->exists(0)) {
             $email = $data;
         } else {
             $email = new Data\Collection($data->get(0));

src/Provider/BitBucket.php

Indentation +87 added lines, -87 removed lines

@@ -21,91 +21,91 @@
  */
 class BitBucket extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.bitbucket.org/2.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://bitbucket.org/site/oauth2/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://bitbucket.org/site/oauth2/access_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.atlassian.com/bitbucket/concepts/oauth2.html';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('user');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('uuid')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('uuid');
-        $userProfile->profileURL = 'https://bitbucket.org/' . $data->get('username') . '/';
-        $userProfile->displayName = $data->get('display_name');
-        $userProfile->email = $data->get('email');
-        $userProfile->webSiteURL = $data->get('website');
-        $userProfile->region = $data->get('location');
-
-        $userProfile->displayName = $userProfile->displayName ?: $data->get('username');
-
-        if (empty($userProfile->email) && strpos($this->scope, 'email') !== false) {
-            try {
-                // user email is not mandatory so keep it quiet
-                $userProfile = $this->requestUserEmail($userProfile);
-            } catch (\Exception $e) {
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * Request user email
-     *
-     * @param $userProfile
-     *
-     * @return User\Profile
-     *
-     * @throws \Exception
-     */
-    protected function requestUserEmail($userProfile)
-    {
-        $response = $this->apiRequest('user/emails');
-
-        foreach ($response->values as $idx => $item) {
-            if (!empty($item->is_primary) && $item->is_primary == true) {
-                $userProfile->email = $item->email;
-
-                if (!empty($item->is_confirmed) && $item->is_confirmed == true) {
-                    $userProfile->emailVerified = $userProfile->email;
-                }
-
-                break;
-            }
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.bitbucket.org/2.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://bitbucket.org/site/oauth2/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://bitbucket.org/site/oauth2/access_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.atlassian.com/bitbucket/concepts/oauth2.html';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('user');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('uuid')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('uuid');
+		$userProfile->profileURL = 'https://bitbucket.org/' . $data->get('username') . '/';
+		$userProfile->displayName = $data->get('display_name');
+		$userProfile->email = $data->get('email');
+		$userProfile->webSiteURL = $data->get('website');
+		$userProfile->region = $data->get('location');
+
+		$userProfile->displayName = $userProfile->displayName ?: $data->get('username');
+
+		if (empty($userProfile->email) && strpos($this->scope, 'email') !== false) {
+			try {
+				// user email is not mandatory so keep it quiet
+				$userProfile = $this->requestUserEmail($userProfile);
+			} catch (\Exception $e) {
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * Request user email
+	 *
+	 * @param $userProfile
+	 *
+	 * @return User\Profile
+	 *
+	 * @throws \Exception
+	 */
+	protected function requestUserEmail($userProfile)
+	{
+		$response = $this->apiRequest('user/emails');
+
+		foreach ($response->values as $idx => $item) {
+			if (!empty($item->is_primary) && $item->is_primary == true) {
+				$userProfile->email = $item->email;
+
+				if (!empty($item->is_confirmed) && $item->is_confirmed == true) {
+					$userProfile->emailVerified = $userProfile->email;
+				}
+
+				break;
+			}
+		}
+
+		return $userProfile;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -55,14 +55,14 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('uuid')) {
+        if ( ! $data->exists('uuid')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
         $userProfile = new User\Profile();
 
         $userProfile->identifier = $data->get('uuid');
-        $userProfile->profileURL = 'https://bitbucket.org/' . $data->get('username') . '/';
+        $userProfile->profileURL = 'https://bitbucket.org/'.$data->get('username').'/';
         $userProfile->displayName = $data->get('display_name');
         $userProfile->email = $data->get('email');
         $userProfile->webSiteURL = $data->get('website');
@@ -95,10 +95,10 @@ 
         $response = $this->apiRequest('user/emails');
 
         foreach ($response->values as $idx => $item) {
-            if (!empty($item->is_primary) && $item->is_primary == true) {
+            if ( ! empty($item->is_primary) && $item->is_primary == true) {
                 $userProfile->email = $item->email;
 
-                if (!empty($item->is_confirmed) && $item->is_confirmed == true) {
+                if ( ! empty($item->is_confirmed) && $item->is_confirmed == true) {
                     $userProfile->emailVerified = $userProfile->email;
                 }
 

src/Provider/Reddit.php

Indentation +71 added lines, -71 removed lines

@@ -17,75 +17,75 @@
  */
 class Reddit extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'identity';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://oauth.reddit.com/api/v1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://ssl.reddit.com/api/v1/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://ssl.reddit.com/api/v1/access_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://github.com/reddit/reddit/wiki/OAuth2';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'duration' => 'permanent'
-        ];
-
-        $this->tokenExchangeParameters = [
-            'client_id' => $this->clientId,
-            'grant_type' => 'authorization_code',
-            'redirect_uri' => $this->callback
-        ];
-
-        $this->tokenExchangeHeaders = [
-            'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
-        ];
-
-        $this->tokenRefreshHeaders = $this->tokenExchangeHeaders;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me.json');
-
-        $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->profileURL = 'https://www.reddit.com/user/' . $data->get('name') . '/';
-        $userProfile->photoURL = $data->get('icon_img');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'identity';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://oauth.reddit.com/api/v1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://ssl.reddit.com/api/v1/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://ssl.reddit.com/api/v1/access_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://github.com/reddit/reddit/wiki/OAuth2';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'duration' => 'permanent'
+		];
+
+		$this->tokenExchangeParameters = [
+			'client_id' => $this->clientId,
+			'grant_type' => 'authorization_code',
+			'redirect_uri' => $this->callback
+		];
+
+		$this->tokenExchangeHeaders = [
+			'Authorization' => 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret)
+		];
+
+		$this->tokenRefreshHeaders = $this->tokenExchangeHeaders;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me.json');
+
+		$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->profileURL = 'https://www.reddit.com/user/' . $data->get('name') . '/';
+		$userProfile->photoURL = $data->get('icon_img');
+
+		return $userProfile;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         ];
 
         $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('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -83,7 +83,7 @@ 
 
         $userProfile->identifier = $data->get('id');
         $userProfile->displayName = $data->get('name');
-        $userProfile->profileURL = 'https://www.reddit.com/user/' . $data->get('name') . '/';
+        $userProfile->profileURL = 'https://www.reddit.com/user/'.$data->get('name').'/';
         $userProfile->photoURL = $data->get('icon_img');
 
         return $userProfile;

src/Provider/WordPress.php

Indentation +37 added lines, -37 removed lines

@@ -17,52 +17,52 @@
  */
 class WordPress extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://public-api.wordpress.com/rest/v1/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://public-api.wordpress.com/rest/v1/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://public-api.wordpress.com/oauth2/authenticate';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://public-api.wordpress.com/oauth2/authenticate';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://public-api.wordpress.com/oauth2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://public-api.wordpress.com/oauth2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.wordpress.com/docs/api/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.wordpress.com/docs/api/';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me/');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me/');
 
-        $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->displayName = $data->get('display_name');
-        $userProfile->photoURL = $data->get('avatar_URL');
-        $userProfile->profileURL = $data->get('profile_URL');
-        $userProfile->email = $data->get('email');
-        $userProfile->language = $data->get('language');
+		$userProfile->identifier = $data->get('ID');
+		$userProfile->displayName = $data->get('display_name');
+		$userProfile->photoURL = $data->get('avatar_URL');
+		$userProfile->profileURL = $data->get('profile_URL');
+		$userProfile->email = $data->get('email');
+		$userProfile->language = $data->get('language');
 
-        $userProfile->displayName = $userProfile->displayName ?: $data->get('username');
+		$userProfile->displayName = $userProfile->displayName ?: $data->get('username');
 
-        $userProfile->emailVerified = $data->get('email_verified') ? $data->get('email') : '';
+		$userProfile->emailVerified = $data->get('email_verified') ? $data->get('email') : '';
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,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/AOLOpenID.php

Indentation +8 added lines, -8 removed lines

@@ -14,13 +14,13 @@
  */
 class AOLOpenID extends OpenID
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $openidIdentifier = 'http://openid.aol.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $openidIdentifier = 'http://openid.aol.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = ''; // Not available
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = ''; // Not available
 }