Merge pull request #11 from kip260384/patch-1

social provider VK api fix

Author: dracony

src/PHPixie/Social/Providers/VK/Provider.php

@@ -52,13 +52,16 @@ protected function normalizeLoginData($loginData, $tokenData)
 
     public function api($token, $method, $endpoint, $query = array(), $data = null)
     {
-        $query['version'] = $this->configData->get('apiVersion', '5.52');
+        $query['v'] = $this->configData->get('apiVersion', '5.52');
         $accessToken = $token->accessToken();
         return $this->apiCall($accessToken, $method, $endpoint, $query, $data);
     }
 
     public function apiCall($accessToken, $method, $endpoint, $query = array(), $data = null)
     {
+        if (!isset($query['v'])) {
+            $query['v'] = $this->configData->get('apiVersion', '5.52');
+        }
         $response = parent::apiCall($accessToken, $method, $endpoint, $query, $data);
 
         if(isset($response->error)) {
@@ -71,13 +74,15 @@ public function apiCall($accessToken, $method, $endpoint, $query = array(), $dat
 
     protected function getUserId($loginData)
     {
-        return $loginData->uid;
+        $id = isset($loginData->id) ? $loginData->id : $loginData->uid;
+
+        return $id;
     }
 
     protected function buildToken($tokenData, $loginData)
     {
         return $this->token(
-            $loginData->uid,
+            $this->getUserId($loginData),
             $tokenData->access_token,
             $tokenData->expires_in
         );