From 54e16ad04609a5652ec84cc9755d55653c77cf42 Mon Sep 17 00:00:00 2001
From: trogwar <hroftt@gmail.com>
Date: Fri, 1 Jul 2016 18:16:46 +0300
Subject: [PATCH] =?UTF-8?q?Deal=20with=20situation=20when=20`friends.get`?=
 =?UTF-8?q?=20return=20only=20ids=20(integers,=20not=20objects)=20?=
 =?UTF-8?q?=E2=80=93=20only=20when=20no=20`fields`-option=20was=20passed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/User.php      |  6 ------
 src/Vkontakte.php | 10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/User.php b/src/User.php
index a0ed04e..82f27b9 100644
--- a/src/User.php
+++ b/src/User.php
@@ -11,8 +11,6 @@ use League\OAuth2\Client\Provider\ResourceOwnerInterface;
  */
 class User implements ResourceOwnerInterface
 {
-    // ========== Interface ==========
-
     /**
      * @type array
      */
@@ -42,8 +40,6 @@ class User implements ResourceOwnerInterface
         return (int)($this->getField('uid') ?: $this->getField('id'));
     }
 
-    // ========== helpers ==========
-
     /**
      * Helper for getting user data
      *
@@ -56,8 +52,6 @@ class User implements ResourceOwnerInterface
         return !empty($this->response[$key]) ? $this->response[$key] : null;
     }
 
-    // ========== Getters for default scope ==========
-
     /**
      * @return string|null DD.MM.YYYY
      */
diff --git a/src/Vkontakte.php b/src/Vkontakte.php
index dd59c96..f95d2ed 100644
--- a/src/Vkontakte.php
+++ b/src/Vkontakte.php
@@ -111,8 +111,6 @@ class Vkontakte extends AbstractProvider
         //'wall_comments',
     ];
 
-    // ========== Abstract ==========
-
     public function getBaseAuthorizationUrl()
     {
         return "$this->baseOAuthUri/authorize";
@@ -173,8 +171,6 @@ class Vkontakte extends AbstractProvider
         return new User($response, $response['id']);
     }
 
-    // ========== API methods ==========
-
     /**
      * @see https://vk.com/dev/users.get
      *
@@ -228,7 +224,11 @@ class Vkontakte extends AbstractProvider
 
         $response     = $this->getResponse($this->createRequest(static::METHOD_GET, $url, $token, []))['response'];
         $friends      = !empty($response['items']) ? $response['items'] : $response;
-        $array2friend = function ($friendData) { return new User($friendData); };
+        $array2friend = function ($friendData) {
+            if (is_numeric($friendData)) $friendData = ['id' => $friendData];
+
+            return new User($friendData);
+        };
 
         return array_map($array2friend, $friends);
     }