From 6652435afc6043b806e086b9bc9c538ba7372e6e Mon Sep 17 00:00:00 2001
From: trogwar <hroftt@gmail.com>
Date: Wed, 29 Jun 2016 22:24:53 +0300
Subject: [PATCH] Update User object of VK

---
 src/User.php      | 12 ++++++++++++
 src/Vkontakte.php | 25 +++++--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 src/User.php

diff --git a/src/User.php b/src/User.php
new file mode 100644
index 0000000..bf4f80c
--- /dev/null
+++ b/src/User.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace J4k\OAuth2\Client\Provider;
+
+use League\OAuth2\Client\Provider\GenericResourceOwner;
+
+class User extends GenericResourceOwner
+{
+    public $email;
+    public $location;
+    public $description;
+}
diff --git a/src/Vkontakte.php b/src/Vkontakte.php
index 7c2cfb0..4e0160c 100644
--- a/src/Vkontakte.php
+++ b/src/Vkontakte.php
@@ -141,27 +141,12 @@ class Vkontakte extends AbstractProvider
 
     protected function createResourceOwner(array $response, AccessToken $token)
     {
-        $response = $response->response[0];
+        $response                = $response->response[0];
+        $response['email']       = property_exists($token, 'email') ? $token->email : null;
+        $response['location']    = property_exists($response, 'country') ? $response->country : null;
+        $response['description'] = property_exists($response, 'status') ? $response->status : null;
 
-        $user = new User();
-
-        $email = (isset($token->email)) ? $token->email : null;
-        $location = (isset($response->country)) ? $response->country : null;
-        $description = (isset($response->status)) ? $response->status : null;
-
-        $user->exchangeArray([
-            'uid' => $response->uid,
-            'nickname' => $response->nickname,
-            'name' => $response->screen_name,
-            'firstname' => $response->first_name,
-            'lastname' => $response->last_name,
-            'email' => $email,
-            'location' => $location,
-            'description' => $description,
-            'imageUrl' => $response->photo_200_orig,
-        ]);
-
-        return $user;
+        return new User($response, $token->uid);
     }
 
     public function userUid($response, AccessToken $token)