vitalif
/
oauth2-client
mirror of https://github.com/vitalif/oauth2-client
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed PHPCS issues.

1.0
Phil Sturgeon 2014-05-03 11:55:30 +01:00
parent 0993f472a6
commit 424b15d4a8
11 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Entity/User.php
View File

@ -24,6 +24,7 @@ class User
$name
));
}
return $this->{$name};
}

1
src/Exception/IDPException.php
View File

@ -61,5 +61,4 @@ class IDPException extends \Exception
return $str . $this->message;
}
}

2
src/Grant/AuthorizationCode.php
View File

@ -13,7 +13,7 @@ class AuthorizationCode implements GrantInterface
public function prepRequestParams($defaultParams, $params)
{
if ( ! isset($params['code']) || empty($params['code'])) {
if (! isset($params['code']) || empty($params['code'])) {
throw new \BadMethodCallException('Missing authorization code');
}

1
src/Grant/GrantInterface.php
View File

@ -9,5 +9,4 @@ interface GrantInterface
public function handleResponse($response = array());
public function prepRequestParams($defaultParams, $params);
}

2
src/Grant/RefreshToken.php
View File

@ -13,7 +13,7 @@ class RefreshToken implements GrantInterface
public function prepRequestParams($defaultParams, $params)
{
if ( ! isset($params['refresh_token']) || empty($params['refresh_token'])) {
if (! isset($params['refresh_token']) || empty($params['refresh_token'])) {
throw new \BadMethodCallException('Missing refresh_token');
}

7
src/Provider/AbstractProvider.php
View File

@ -109,12 +109,13 @@ abstract class AbstractProvider
{
if (is_string($grant)) {
$grant = 'League\\OAuth2\\Client\\Grant\\'.ucfirst(str_replace('_', '', $grant));
if ( ! class_exists($grant)) {
if (! class_exists($grant)) {
throw new \InvalidArgumentException('Unknown grant "'.$grant.'"');
}
$grant = new $grant;
} elseif (! $grant instanceof GrantInterface) {
throw new \InvalidArgumentException(get_class($grant) . ' is not an instance of League\OAuth2\Client\Grant\GrantInterface');
$message = get_class($grant).' is not an instance of League\OAuth2\Client\Grant\GrantInterface';
throw new \InvalidArgumentException($message);
}
$defaultParams = array(
@ -209,7 +210,7 @@ abstract class AbstractProvider
* @param string $arg_separator
* @param null|integer $enc_type
* @return string
* @codeCoverageIgnoreStart
* @codeCoverageIgnoreStart
*/
protected function httpBuildQuery($params, $numeric_prefix = 0, $arg_separator = '&', $enc_type = null)
{

1
src/Provider/Instagram.php
View File

@ -56,5 +56,4 @@ class Instagram extends AbstractProvider
{
return $response->data->full_name;
}
}

23
src/Provider/LinkedIn.php
View File

@ -3,12 +3,16 @@
namespace League\OAuth2\Client\Provider;
use League\OAuth2\Client\Entity\User;
use League\OAuth2\Client\Token\AccessToken;
class LinkedIn extends AbstractProvider
{
public $scopes = array('r_basicprofile r_emailaddress r_contactinfo');
public $responseType = 'json';
public $fields = array('id', 'email-address', 'first-name', 'last-name', 'headline', 'location', 'industry', 'picture-url', 'public-profile-url');
public $fields = array(
'id', 'email-address', 'first-name', 'last-name', 'headline',
'location', 'industry', 'picture-url', 'public-profile-url'
);
public function urlAuthorize()
{
@ -20,12 +24,13 @@ class LinkedIn extends AbstractProvider
return 'https://www.linkedin.com/uas/oauth2/accessToken';
}
public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token)
public function urlUserDetails(AccessToken $token)
{
return 'https://api.linkedin.com/v1/people/~:(' . implode(",", $this->fields) . ')?format=json&oauth2_access_token=' . $token;
return 'https://api.linkedin.com/v1/people/~:(' . implode(",", $this->fields)
. ')?format=json&oauth2_access_token=' . $token;
}
public function userDetails($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userDetails($response, AccessToken $token)
{
$user = new User;
@ -48,17 +53,19 @@ class LinkedIn extends AbstractProvider
return $user;
}
public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userUid($response, AccessToken $token)
{
return $response->id;
}
public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userEmail($response, AccessToken $token)
{
return isset($response->emailAddress) && $response->emailAddress ? $response->emailAddress : null;
return isset($response->emailAddress) && $response->emailAddress
? $response->emailAddress
: null;
}
public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userScreenName($response, AccessToken $token)
{
return array($response->firstName, $response->lastName);
}

15
src/Provider/Microsoft.php
View File

@ -3,6 +3,7 @@
namespace League\OAuth2\Client\Provider;
use League\OAuth2\Client\Entity\User;
use League\OAuth2\Client\Token\AccessToken;
class Microsoft extends AbstractProvider
{
@ -19,12 +20,12 @@ class Microsoft extends AbstractProvider
return 'https://oauth.live.com/token';
}
public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token)
public function urlUserDetails(AccessToken $token)
{
return 'https://apis.live.net/v5.0/me?access_token='.$token;
}
public function userDetails($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userDetails($response, AccessToken $token)
{
$client = $this->getHttpClient();
$client->setBaseUrl('https://apis.live.net/v5.0/' . $response->id . '/picture');
@ -49,17 +50,19 @@ class Microsoft extends AbstractProvider
return $user;
}
public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userUid($response, AccessToken $token)
{
return $response->id;
}
public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userEmail($response, AccessToken $token)
{
return isset($response->emails->preferred) && $response->emails->preferred ? $response->emails->preferred : null;
return isset($response->emails->preferred) && $response->emails->preferred
? $response->emails->preferred
: null;
}
public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userScreenName($response, AccessToken $token)
{
return array($response->first_name, $response->last_name);
}

14
src/Provider/Vkontakte.php
View File

@ -3,6 +3,7 @@
namespace League\OAuth2\Client\Provider;
use League\OAuth2\Client\Entity\User;
use League\OAuth2\Client\Token\AccessToken;
class Vkontakte extends AbstractProvider
{
@ -19,7 +20,7 @@ class Vkontakte extends AbstractProvider
return 'https://oauth.vk.com/access_token';
}
public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token)
public function urlUserDetails(AccessToken $token)
{
$fields = array('nickname',
'screen_name',
@ -47,10 +48,11 @@ class Vkontakte extends AbstractProvider
'schools',
'verified');
return "https://api.vk.com/method/users.get?user_id={$token->uid}&fields=".implode(",", $fields)."&access_token=".$token;
return "https://api.vk.com/method/users.get?user_id={$token->uid}&fields="
. implode(",", $fields)."&access_token={$token}";
}
public function userDetails($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userDetails($response, AccessToken $token)
{
$response = $response->response[0];
@ -75,21 +77,21 @@ class Vkontakte extends AbstractProvider
return $user;
}
public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userUid($response, AccessToken $token)
{
$response = $response->response[0];
return $response->uid;
}
public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userEmail($response, AccessToken $token)
{
$response = $response->response[0];
return isset($response->email) && $response->email ? $response->email : null;
}
public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token)
public function userScreenName($response, AccessToken $token)
{
$response = $response->response[0];

6
src/Token/AccessToken.php
View File

@ -35,8 +35,10 @@ class AccessToken
public function __construct(array $options = null)
{
if (! isset($options['access_token'])) {
throw new \InvalidArgumentException('Required option not passed: access_token'
. PHP_EOL.print_r($options, true));
throw new \InvalidArgumentException(
'Required option not passed: access_token'. PHP_EOL
. print_r($options, true)
);
}
$this->accessToken = $options['access_token'];