Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitignore
AndrewNovikof · Jan 22, 2019 · 47a5d6e · 47a5d6e
2 parents f16263b + 063c05b
commit 47a5d6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 .idea
-vendor
-composer.lock
+composer.lock
+/vendor
diff --git a/src/Provider.php b/src/Provider.php
@@ -32,7 +32,7 @@ class Provider extends AbstractProvider implements ProviderInterface
      *
      * @var array
      */
-    protected $fields = ['name', 'email', 'gender', 'verified', 'link', 'age_range'];
+    protected $fields = ['name', 'email', 'gender', 'verified', 'link', 'age_range', 'about', 'education', 'work'];
 
     /**
      * The scopes being requested.
@@ -105,10 +105,13 @@ protected function mapUserToObject(array $user)
             'nickname' => isset($user['name']) ? $user['name'] : null,
             'name' => isset($user['name']) ? $user['name'] : null,
             'email' => isset($user['email']) ? $user['email'] : null,
-            'avatar' => $avatarUrl . '?type=normal',
+            'avatar' => $avatarUrl . '?width=1920',
             'avatar_original' => $avatarUrl . '?width=1920',
             'profileUrl' => isset($user['link']) ? $user['link'] : null,
             'age_range' => isset($user['age_range']) ? $user['age_range'] : null,
+            'about' => isset($user['about']) ? $user['about'] : null,
+            'education' => isset($user['education']) ? $user['education'] : null,
+            'work' => isset($user['work']) ? $user['work'] : null,
         ]);
     }