hybridauth / hybridauth

src/Provider/Instagram.php

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/Provider/AutoDesk.php

Indentation +64 added lines, -64 removed lines

@@ -17,80 +17,80 @@
  */
 class AutoDesk extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'data:read';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'data:read';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://developer.api.autodesk.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://developer.api.autodesk.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl
-        = 'https://developer.api.autodesk.com/authentication/v1/authorize';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl
+		= 'https://developer.api.autodesk.com/authentication/v1/authorize';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl
-        = 'https://developer.api.autodesk.com/authentication/v1/gettoken';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl
+		= 'https://developer.api.autodesk.com/authentication/v1/gettoken';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $refreshTokenUrl
-        = 'https://developer.api.autodesk.com/authentication/v1/refreshtoken';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $refreshTokenUrl
+		= 'https://developer.api.autodesk.com/authentication/v1/refreshtoken';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation
-        = 'https://forge.autodesk.com/en/docs/oauth/v2/developers_guide/overview/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation
+		= 'https://forge.autodesk.com/en/docs/oauth/v2/developers_guide/overview/';
 
-    /**
-     * {@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,
-                'grant_type'    => 'refresh_token',
-            ];
-        }
-    }
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id'     => $this->clientId,
+				'client_secret' => $this->clientSecret,
+				'grant_type'    => 'refresh_token',
+			];
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * See: https://forge.autodesk.com/en/docs/oauth/v2/reference/http/users-@me-GET/
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('userprofile/v1/users/@me');
+	/**
+	 * {@inheritdoc}
+	 *
+	 * See: https://forge.autodesk.com/en/docs/oauth/v2/reference/http/users-@me-GET/
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('userprofile/v1/users/@me');
 
-        $collection = new Data\Collection($response);
+		$collection = new Data\Collection($response);
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $collection->get('userId');
-        $userProfile->displayName
-            = $collection->get('firstName') .' '. $collection->get('lastName');
-        $userProfile->firstName = $collection->get('firstName');
-        $userProfile->lastName = $collection->get('lastName');
-        $userProfile->email = $collection->get('emailId');
-        $userProfile->language = $collection->get('language');
-        $userProfile->webSiteURL = $collection->get('websiteUrl');
-        $userProfile->photoURL
-            = $collection->filter('profileImages')->get('sizeX360');
+		$userProfile->identifier = $collection->get('userId');
+		$userProfile->displayName
+			= $collection->get('firstName') .' '. $collection->get('lastName');
+		$userProfile->firstName = $collection->get('firstName');
+		$userProfile->lastName = $collection->get('lastName');
+		$userProfile->email = $collection->get('emailId');
+		$userProfile->language = $collection->get('language');
+		$userProfile->webSiteURL = $collection->get('websiteUrl');
+		$userProfile->photoURL
+			= $collection->filter('profileImages')->get('sizeX360');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/WeChat.php

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/Twitter.php

Indentation +221 added lines, -221 removed lines

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

src/Data/Collection.php

Indentation +139 added lines, -139 removed lines

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

src/HttpClient/Guzzle.php

Indentation +240 added lines, -240 removed lines

@@ -33,244 +33,244 @@
  */
 class Guzzle implements HttpClientInterface
 {
-    /**
-     * Method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @var array
-     */
-    protected $requestArguments = [];
-
-    /**
-     * Default request headers
-     *
-     * @var array
-     */
-    protected $requestHeader = [];
-
-    /**
-     * Raw response returned by server
-     *
-     * @var string
-     */
-    protected $responseBody = '';
-
-    /**
-     * Headers returned in the response
-     *
-     * @var array
-     */
-    protected $responseHeader = [];
-
-    /**
-     * Response HTTP status code
-     *
-     * @var int
-     */
-    protected $responseHttpCode = 0;
-
-    /**
-     * Last curl error number
-     *
-     * @var mixed
-     */
-    protected $responseClientError = null;
-
-    /**
-     * Information about the last transfer
-     *
-     * @var mixed
-     */
-    protected $responseClientInfo = [];
-
-    /**
-     * Hybridauth logger instance
-     *
-     * @var object
-     */
-    protected $logger = null;
-
-    /**
-     * GuzzleHttp client
-     *
-     * @var \GuzzleHttp\Client
-     */
-    protected $client = null;
-
-    /**
-     * ..
-     * @param null $client
-     * @param array $config
-     */
-    public function __construct($client = null, $config = [])
-    {
-        $this->client = $client ? $client : new Client($config);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        $this->requestHeader = array_replace($this->requestHeader, (array)$headers);
-
-        $this->requestArguments = [
-            'uri' => $uri,
-            'method' => $method,
-            'parameters' => $parameters,
-            'headers' => $this->requestHeader,
-        ];
-
-        $response = null;
-
-        try {
-            switch ($method) {
-                case 'GET':
-                case 'DELETE':
-                    $response = $this->client->request($method, $uri, [
-                        'query' => $parameters,
-                        'headers' => $this->requestHeader,
-                    ]);
-                    break;
-                case 'PUT':
-                case 'PATCH':
-                case 'POST':
-                    $body_type = $multipart ? 'multipart' : 'form_params';
-
-                    if (isset($this->requestHeader['Content-Type'])
-                        && $this->requestHeader['Content-Type'] === 'application/json'
-                    ) {
-                        $body_type = 'json';
-                    }
-
-                    $body_content = $parameters;
-                    if ($multipart) {
-                        $body_content = [];
-                        foreach ($parameters as $key => $val) {
-                            if ($val instanceof \CURLFile) {
-                                $val = fopen($val->getFilename(), 'r');
-                            }
-
-                            $body_content[] = [
-                                'name' => $key,
-                                'contents' => $val,
-                            ];
-                        }
-                    }
-
-                    $response = $this->client->request($method, $uri, [
-                        $body_type => $body_content,
-                        'headers' => $this->requestHeader,
-                    ]);
-                    break;
-            }
-        } catch (\Exception $e) {
-            $response = $e->getResponse();
-
-            $this->responseClientError = $e->getMessage();
-        }
-
-        if (!$this->responseClientError) {
-            $this->responseBody = $response->getBody();
-            $this->responseHttpCode = $response->getStatusCode();
-            $this->responseHeader = $response->getHeaders();
-        }
-
-        if ($this->logger) {
-            // phpcs:ignore
-            $this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
-
-            if ($this->responseClientError) {
-                // phpcs:ignore
-                $this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
-            }
-        }
-
-        return $this->responseBody;
-    }
-
-    /**
-     * Get response details
-     *
-     * @return array Map structure of details
-     */
-    public function getResponse()
-    {
-        return [
-            'request' => $this->getRequestArguments(),
-            'response' => [
-                'code' => $this->getResponseHttpCode(),
-                'headers' => $this->getResponseHeader(),
-                'body' => $this->getResponseBody(),
-            ],
-            'client' => [
-                'error' => $this->getResponseClientError(),
-                'info' => $this->getResponseClientInfo(),
-                'opts' => null,
-            ],
-        ];
-    }
-
-    /**
-     * Set logger instance
-     *
-     * @param object $logger
-     */
-    public function setLogger($logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseBody()
-    {
-        return $this->responseBody;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHeader()
-    {
-        return $this->responseHeader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHttpCode()
-    {
-        return $this->responseHttpCode;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseClientError()
-    {
-        return $this->responseClientError;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getResponseClientInfo()
-    {
-        return $this->responseClientInfo;
-    }
-
-    /**
-     * Returns method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @return array
-     */
-    protected function getRequestArguments()
-    {
-        return $this->requestArguments;
-    }
+	/**
+	 * Method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @var array
+	 */
+	protected $requestArguments = [];
+
+	/**
+	 * Default request headers
+	 *
+	 * @var array
+	 */
+	protected $requestHeader = [];
+
+	/**
+	 * Raw response returned by server
+	 *
+	 * @var string
+	 */
+	protected $responseBody = '';
+
+	/**
+	 * Headers returned in the response
+	 *
+	 * @var array
+	 */
+	protected $responseHeader = [];
+
+	/**
+	 * Response HTTP status code
+	 *
+	 * @var int
+	 */
+	protected $responseHttpCode = 0;
+
+	/**
+	 * Last curl error number
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientError = null;
+
+	/**
+	 * Information about the last transfer
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientInfo = [];
+
+	/**
+	 * Hybridauth logger instance
+	 *
+	 * @var object
+	 */
+	protected $logger = null;
+
+	/**
+	 * GuzzleHttp client
+	 *
+	 * @var \GuzzleHttp\Client
+	 */
+	protected $client = null;
+
+	/**
+	 * ..
+	 * @param null $client
+	 * @param array $config
+	 */
+	public function __construct($client = null, $config = [])
+	{
+		$this->client = $client ? $client : new Client($config);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		$this->requestHeader = array_replace($this->requestHeader, (array)$headers);
+
+		$this->requestArguments = [
+			'uri' => $uri,
+			'method' => $method,
+			'parameters' => $parameters,
+			'headers' => $this->requestHeader,
+		];
+
+		$response = null;
+
+		try {
+			switch ($method) {
+				case 'GET':
+				case 'DELETE':
+					$response = $this->client->request($method, $uri, [
+						'query' => $parameters,
+						'headers' => $this->requestHeader,
+					]);
+					break;
+				case 'PUT':
+				case 'PATCH':
+				case 'POST':
+					$body_type = $multipart ? 'multipart' : 'form_params';
+
+					if (isset($this->requestHeader['Content-Type'])
+						&& $this->requestHeader['Content-Type'] === 'application/json'
+					) {
+						$body_type = 'json';
+					}
+
+					$body_content = $parameters;
+					if ($multipart) {
+						$body_content = [];
+						foreach ($parameters as $key => $val) {
+							if ($val instanceof \CURLFile) {
+								$val = fopen($val->getFilename(), 'r');
+							}
+
+							$body_content[] = [
+								'name' => $key,
+								'contents' => $val,
+							];
+						}
+					}
+
+					$response = $this->client->request($method, $uri, [
+						$body_type => $body_content,
+						'headers' => $this->requestHeader,
+					]);
+					break;
+			}
+		} catch (\Exception $e) {
+			$response = $e->getResponse();
+
+			$this->responseClientError = $e->getMessage();
+		}
+
+		if (!$this->responseClientError) {
+			$this->responseBody = $response->getBody();
+			$this->responseHttpCode = $response->getStatusCode();
+			$this->responseHeader = $response->getHeaders();
+		}
+
+		if ($this->logger) {
+			// phpcs:ignore
+			$this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
+
+			if ($this->responseClientError) {
+				// phpcs:ignore
+				$this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
+			}
+		}
+
+		return $this->responseBody;
+	}
+
+	/**
+	 * Get response details
+	 *
+	 * @return array Map structure of details
+	 */
+	public function getResponse()
+	{
+		return [
+			'request' => $this->getRequestArguments(),
+			'response' => [
+				'code' => $this->getResponseHttpCode(),
+				'headers' => $this->getResponseHeader(),
+				'body' => $this->getResponseBody(),
+			],
+			'client' => [
+				'error' => $this->getResponseClientError(),
+				'info' => $this->getResponseClientInfo(),
+				'opts' => null,
+			],
+		];
+	}
+
+	/**
+	 * Set logger instance
+	 *
+	 * @param object $logger
+	 */
+	public function setLogger($logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseBody()
+	{
+		return $this->responseBody;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHeader()
+	{
+		return $this->responseHeader;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHttpCode()
+	{
+		return $this->responseHttpCode;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseClientError()
+	{
+		return $this->responseClientError;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getResponseClientInfo()
+	{
+		return $this->responseClientInfo;
+	}
+
+	/**
+	 * Returns method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @return array
+	 */
+	protected function getRequestArguments()
+	{
+		return $this->requestArguments;
+	}
 }

src/Provider/Amazon.php

Indentation +49 added lines, -49 removed lines

@@ -17,65 +17,65 @@
  */
 class Amazon extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'profile';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'profile';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.amazon.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.amazon.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.amazon.com/ap/oa';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.amazon.com/ap/oa';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.amazon.com/auth/o2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.amazon.com/auth/o2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.amazon.com/docs/login-with-amazon/documentation-overview.html';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.amazon.com/docs/login-with-amazon/documentation-overview.html';
 
-    /**
-     * {@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}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('user/profile');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('user/profile');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('user_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('user_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $data->get('user_id');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->email = $data->get('email');
+		$userProfile->identifier = $data->get('user_id');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->email = $data->get('email');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/Spotify.php

Indentation +73 added lines, -73 removed lines

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

src/Provider/Seznam.php

Indentation +43 added lines, -43 removed lines

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