PSR-2 CS Fixes

1.0
Phil Sturgeon 2013-11-17 21:45:28 -05:00
parent ecabb7df87
commit 38b94802fd
8 changed files with 49 additions and 51 deletions

View File

@ -20,4 +20,4 @@
<log type="coverage-clover" target="logs/clover.xml"/> <log type="coverage-clover" target="logs/clover.xml"/>
<log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/> <log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
</logging> </logging>
</phpunit> </phpunit>

View File

@ -4,8 +4,8 @@ namespace League\OAuth2\Client\Grant;
use League\OAuth2\Client\Token\AccessToken as AccessToken; use League\OAuth2\Client\Token\AccessToken as AccessToken;
class Authorizationcode implements GrantInterface { class Authorizationcode implements GrantInterface
{
public function __toString() public function __toString()
{ {
return 'authorization_code'; return 'authorization_code';
@ -24,4 +24,4 @@ class Authorizationcode implements GrantInterface {
{ {
return new AccessToken($response); return new AccessToken($response);
} }
} }

View File

@ -2,12 +2,12 @@
namespace League\OAuth2\Client\Grant; namespace League\OAuth2\Client\Grant;
interface GrantInterface { interface GrantInterface
{
public function __toString(); public function __toString();
public function handleResponse($response = array()); public function handleResponse($response = array());
public function prepRequestParams($defaultParams, $params); public function prepRequestParams($defaultParams, $params);
} }

View File

@ -7,8 +7,8 @@ use League\OAuth2\Client\Token\AccessToken as AccessToken;
use League\OAuth2\Client\Token\Authorize as AuthorizeToken; use League\OAuth2\Client\Token\Authorize as AuthorizeToken;
use League\OAuth2\Client\Exception\IDPException as IDPException; use League\OAuth2\Client\Exception\IDPException as IDPException;
abstract class IdentityProvider { abstract class IdentityProvider
{
public $clientId = ''; public $clientId = '';
public $clientSecret = ''; public $clientSecret = '';

View File

@ -2,7 +2,7 @@
namespace League\OAuth2\Client\Provider; namespace League\OAuth2\Client\Provider;
class Linkedin extends IdentityProvider class LinkedIn extends IdentityProvider
{ {
public $scopes = array('r_basicprofile r_emailaddress r_contactinfo'); public $scopes = array('r_basicprofile r_emailaddress r_contactinfo');
public $responseType = 'json'; public $responseType = 'json';
@ -39,7 +39,7 @@ class Linkedin extends IdentityProvider
return $user; return $user;
} }
public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token) public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
return $response->id; return $response->id;

View File

@ -2,8 +2,8 @@
namespace League\OAuth2\Client\Provider; namespace League\OAuth2\Client\Provider;
class User implements \IteratorAggregate { class User implements \IteratorAggregate
{
public $uid = null; public $uid = null;
public $nickname = null; public $nickname = null;
public $name = null; public $name = null;
@ -37,4 +37,3 @@ class User implements \IteratorAggregate {
} }
} }

View File

@ -19,38 +19,38 @@ class Vkontakte extends IdentityProvider
public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token) public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token)
{ {
$fields = array('nickname', $fields = array('nickname',
'screen_name', 'screen_name',
'sex', 'sex',
'bdate', 'bdate',
'city', 'city',
'country', 'country',
'timezone', 'timezone',
'photo_50', 'photo_50',
'photo_100', 'photo_100',
'photo_200_orig', 'photo_200_orig',
'has_mobile', 'has_mobile',
'contacts', 'contacts',
'education', 'education',
'online', 'online',
'counters', 'counters',
'relation', 'relation',
'last_seen', 'last_seen',
'status', 'status',
'can_write_private_message', 'can_write_private_message',
'can_see_all_posts', 'can_see_all_posts',
'can_see_audio', 'can_see_audio',
'can_post', 'can_post',
'universities', 'universities',
'schools', 'schools',
'verified'); '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, \League\OAuth2\Client\Token\AccessToken $token)
{ {
$response = $response->response[0]; $response = $response->response[0];
$user = new User; $user = new User;
$user->uid = $response->uid; $user->uid = $response->uid;
@ -68,22 +68,22 @@ class Vkontakte extends IdentityProvider
public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token) public function userUid($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
$response = $response->response[0]; $response = $response->response[0];
return $response->uid; return $response->uid;
} }
public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token) public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
$response = $response->response[0]; $response = $response->response[0];
return isset($response->email) && $response->email ? $response->email : null; return isset($response->email) && $response->email ? $response->email : null;
} }
public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token) public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
$response = $response->response[0]; $response = $response->response[0];
return array($response->first_name, $response->last_name); return array($response->first_name, $response->last_name);
} }
} }

View File

@ -1,6 +1,5 @@
<?php <?php
if ( ! @include_once __DIR__ . '/../vendor/autoload.php') if ( ! @include_once __DIR__ . '/../vendor/autoload.php') {
{
exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n"); exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n");
} }