diff --git a/README.md b/README.md index 45f97db..e7e3880 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ $provider = new J4k\OAuth2\Client\Provider\Vkontakte([ 'clientId' => '1234567', 'clientSecret' => 's0meRe4lLySEcRetC0De', 'redirectUri' => 'https://example.org/oauth-endpoint', - 'scopes' => ['email', 'offline', 'friends'], + 'scope' => ['email', 'offline', 'friends'], ]); ``` diff --git a/composer.json b/composer.json index 7b00dd4..cc28df5 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ } ], "require": { - "php" : ">=5.5", - "league/oauth2-client": "^1.4" + "php" : ">=5.6", + "league/oauth2-client": "^2.0" }, "require-dev": { "phpunit/phpunit" : "~4.6", diff --git a/src/Vkontakte.php b/src/Vkontakte.php index ec9565d..38defed 100644 --- a/src/Vkontakte.php +++ b/src/Vkontakte.php @@ -11,7 +11,7 @@ class Vkontakte extends AbstractProvider { protected $baseOAuthUri = 'https://oauth.vk.com'; protected $baseUri = 'https://api.vk.com/method'; - protected $version = '5.52'; + protected $version = '5.63'; protected $language = null; /** @@ -190,7 +190,7 @@ protected function createResourceOwner(array $response, AccessToken $token) $response['id'] = $additional['user_id']; } - return new User($response, $response['id']); + return new VkontakteUser($response, $response['id']); } /** @@ -200,7 +200,7 @@ protected function createResourceOwner(array $response, AccessToken $token) * @param AccessToken|null $token Current user if empty * @param array $params * - * @return User[] + * @return VkontakteUser[] */ public function usersGet(array $ids = [], AccessToken $token = null, array $params = []) { @@ -222,7 +222,7 @@ public function usersGet(array $ids = [], AccessToken $token = null, array $para $response = $this->getResponse($this->createRequest(static::METHOD_GET, $url, $token, []))['response']; $users = !empty($response['items']) ? $response['items'] : $response; $array2user = function ($userData) { - return new User($userData); + return new VkontakteUser($userData); }; return array_map($array2user, $users); @@ -234,7 +234,7 @@ public function usersGet(array $ids = [], AccessToken $token = null, array $para * @param AccessToken|null $token * @param array $params * - * @return User[] + * @return VkontakteUser[] */ public function friendsGet($userId, AccessToken $token = null, array $params = []) { @@ -256,7 +256,7 @@ public function friendsGet($userId, AccessToken $token = null, array $params = [ $friendData = ['id' => $friendData]; } - return new User($friendData); + return new VkontakteUser($friendData); }; return array_map($array2friend, $friends); diff --git a/src/User.php b/src/VkontakteUser.php similarity index 98% rename from src/User.php rename to src/VkontakteUser.php index 82f27b9..1f1faeb 100644 --- a/src/User.php +++ b/src/VkontakteUser.php @@ -9,7 +9,7 @@ * * @package J4k\OAuth2\Client\Provider */ -class User implements ResourceOwnerInterface +class VkontakteUser implements ResourceOwnerInterface { /** * @type array