From fd8f82915bc45b2db0e0df6c17f1cd25ca9601c7 Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 11:41:12 +0300 Subject: [PATCH 1/8] Create composer.json change name + require version of client --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7b00dd4..f5393b0 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "j4k/oauth2-vkontakte", + "name": "brutto/oauth2-vkontakte", "description": "Vkontakte provider for league/oauth2-client", "keywords": [ "league", @@ -14,7 +14,7 @@ ], "require": { "php" : ">=5.5", - "league/oauth2-client": "^1.4" + "league/oauth2-client": "^2.0" }, "require-dev": { "phpunit/phpunit" : "~4.6", From 4f6f27a417d27f6ca4a517fa36dd8f69e43ab98d Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 11:46:19 +0300 Subject: [PATCH 2/8] Create VkontakteUser.php rename as official --- src/{User.php => VkontakteUser.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{User.php => VkontakteUser.php} (100%) diff --git a/src/User.php b/src/VkontakteUser.php similarity index 100% rename from src/User.php rename to src/VkontakteUser.php From c6a6145620b91b916680ab1b11834a0bde919b9b Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 11:49:45 +0300 Subject: [PATCH 3/8] Create Vkontakte.php --- src/Vkontakte.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Vkontakte.php b/src/Vkontakte.php index ec9565d..4357022 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; /** From 3eb7d798f0bd8a22b2f5735614c30c63bbb203fd Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 12:01:25 +0300 Subject: [PATCH 4/8] Update README.md wrong parameter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'], ]); ``` From d71b8e5872bccc5088afa1a9c7b921fd5e3c1c1f Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 12:03:40 +0300 Subject: [PATCH 5/8] Create Vkontakte.php rename user --- src/Vkontakte.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Vkontakte.php b/src/Vkontakte.php index 4357022..38defed 100644 --- a/src/Vkontakte.php +++ b/src/Vkontakte.php @@ -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); From b01f869e23b3b8d9c41d1603b2e7a49b694ad55d Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 12:06:48 +0300 Subject: [PATCH 6/8] Create VkontakteUser.php --- src/VkontakteUser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VkontakteUser.php b/src/VkontakteUser.php index 82f27b9..1f1faeb 100644 --- a/src/VkontakteUser.php +++ b/src/VkontakteUser.php @@ -9,7 +9,7 @@ * * @package J4k\OAuth2\Client\Provider */ -class User implements ResourceOwnerInterface +class VkontakteUser implements ResourceOwnerInterface { /** * @type array From 680d183f3bb361900a3cf12017e7980fdb9e997c Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 12:15:12 +0300 Subject: [PATCH 7/8] Update composer.json add support oauth2-client up to 2.x version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5393b0..dca418e 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "brutto/oauth2-vkontakte", + "name": "j4k/oauth2-vkontakte", "description": "Vkontakte provider for league/oauth2-client", "keywords": [ "league", From 3d3dfdb3b1a727ea233cb1442fa00edb8acf3d03 Mon Sep 17 00:00:00 2001 From: Anton Karakulov Date: Thu, 8 Jun 2017 13:53:15 +0300 Subject: [PATCH 8/8] Create composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dca418e..cc28df5 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ } ], "require": { - "php" : ">=5.5", + "php" : ">=5.6", "league/oauth2-client": "^2.0" }, "require-dev": {