From 424b15d4a807c095ef7af42659cffdbf2a2f1eb6 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sat, 3 May 2014 11:55:30 +0100 Subject: [PATCH] Fixed PHPCS issues. --- src/Entity/User.php | 1 + src/Exception/IDPException.php | 1 - src/Grant/AuthorizationCode.php | 2 +- src/Grant/GrantInterface.php | 1 - src/Grant/RefreshToken.php | 2 +- src/Provider/AbstractProvider.php | 7 ++++--- src/Provider/Instagram.php | 1 - src/Provider/LinkedIn.php | 23 +++++++++++++++-------- src/Provider/Microsoft.php | 15 +++++++++------ src/Provider/Vkontakte.php | 14 ++++++++------ src/Token/AccessToken.php | 6 ++++-- 11 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/Entity/User.php b/src/Entity/User.php index 77f757b..ce06d6f 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -24,6 +24,7 @@ class User $name )); } + return $this->{$name}; } diff --git a/src/Exception/IDPException.php b/src/Exception/IDPException.php index effec6c..0929b64 100644 --- a/src/Exception/IDPException.php +++ b/src/Exception/IDPException.php @@ -61,5 +61,4 @@ class IDPException extends \Exception return $str . $this->message; } - } diff --git a/src/Grant/AuthorizationCode.php b/src/Grant/AuthorizationCode.php index f1eb0bd..a788fb8 100644 --- a/src/Grant/AuthorizationCode.php +++ b/src/Grant/AuthorizationCode.php @@ -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'); } diff --git a/src/Grant/GrantInterface.php b/src/Grant/GrantInterface.php index ecad1f1..410d7b8 100644 --- a/src/Grant/GrantInterface.php +++ b/src/Grant/GrantInterface.php @@ -9,5 +9,4 @@ interface GrantInterface public function handleResponse($response = array()); public function prepRequestParams($defaultParams, $params); - } diff --git a/src/Grant/RefreshToken.php b/src/Grant/RefreshToken.php index 76fe7ea..92ac831 100644 --- a/src/Grant/RefreshToken.php +++ b/src/Grant/RefreshToken.php @@ -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'); } diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php index 82342d2..a5bb543 100644 --- a/src/Provider/AbstractProvider.php +++ b/src/Provider/AbstractProvider.php @@ -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) { diff --git a/src/Provider/Instagram.php b/src/Provider/Instagram.php index 05ce125..877a4a1 100644 --- a/src/Provider/Instagram.php +++ b/src/Provider/Instagram.php @@ -56,5 +56,4 @@ class Instagram extends AbstractProvider { return $response->data->full_name; } - } diff --git a/src/Provider/LinkedIn.php b/src/Provider/LinkedIn.php index 5d339db..64d7fcc 100644 --- a/src/Provider/LinkedIn.php +++ b/src/Provider/LinkedIn.php @@ -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); } diff --git a/src/Provider/Microsoft.php b/src/Provider/Microsoft.php index e97ab6b..fe80212 100644 --- a/src/Provider/Microsoft.php +++ b/src/Provider/Microsoft.php @@ -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); } diff --git a/src/Provider/Vkontakte.php b/src/Provider/Vkontakte.php index d284157..ce9906d 100644 --- a/src/Provider/Vkontakte.php +++ b/src/Provider/Vkontakte.php @@ -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]; diff --git a/src/Token/AccessToken.php b/src/Token/AccessToken.php index 83c5e73..d2e9ef0 100755 --- a/src/Token/AccessToken.php +++ b/src/Token/AccessToken.php @@ -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'];