Bugfix overtrue/laravel-wechat#117

ssitcloud · Dec 28, 2017 · bbc890f · bbc890f
1 parent 5e4bb86
commit bbc890f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/User.php b/src/User.php
@@ -160,6 +160,6 @@ public function getOriginal()
      */
     public function jsonSerialize()
     {
-        return array_merge($this->attributes, ['token' => $this->token->getAttributes()]);
+        return array_merge($this->attributes, ['token' => $this->token ? $this->token->getAttributes() : null]);
     }
 }
diff --git a/tests/UserTest.php b/tests/UserTest.php
@@ -0,0 +1,15 @@
+<?php
+
+
+use Overtrue\Socialite\AccessToken;
+use Overtrue\Socialite\User;
+
+class UserTest extends \PHPUnit_Framework_TestCase
+{
+    public function testJsonserialize()
+    {
+        $this->assertSame('{"token":null}', json_encode(new User([])));
+
+        $this->assertSame('{"token":{"access_token":"mock-token"}}', json_encode(new User(['token' => new AccessToken(['access_token' => 'mock-token'])])));
+    }
+}