Merge pull request #50 from juvenn/v0.2

发布 0.2.3 : 修复 getCurrentUser 循环调用问题

Author: juvenn

Changelog.md

@@ -1,4 +1,9 @@
 
+0.2.3 发布日期：2016-01-12
+----
+
+* 修复 getCurrentUser 循环调用问题 close #48
+
 0.2.2 发布日期：2016-01-06
 ----
 

src/LeanCloud/LeanClient.php

@@ -22,7 +22,7 @@ class LeanClient {
     /**
      * Client version
      */
-    const VERSION = '0.2.2';
+    const VERSION = '0.2.3';
 
     /**
      * API Endpoints for Regions

src/LeanCloud/LeanFile.php

@@ -57,8 +57,10 @@ public function __construct($name, $data=null, $mimeType=null) {
         }
         $this->_data["mime_type"] = $mimeType;
 
-        $user = LeanUser::getCurrentUser();
-        $this->_metaData["owner"] = $user ? $user->getObjectId() : "unknown";
+        $this->_metaData["owner"] = "unknown";
+        if (LeanUser::$currentUser) {
+            $this->_metaData["owner"] = LeanUser::$currentUser->getObjectId();
+        }
         if ($this->_source) {
             $this->_metaData["size"] = strlen($this->_source);
         }

src/LeanCloud/LeanUser.php

@@ -49,7 +49,7 @@ class LeanUser extends LeanObject {
      *
      * @var LeanUser
      */
-    protected static $currentUser = null;
+    public static $currentUser = null;
 
     /**
      * Set username
@@ -185,7 +185,7 @@ public function getSessionToken() {
      *
      * @param string $token Session token of logged-in user
      */
-    protected static function setCurrentSessionToken($token) {
+    public static function setCurrentSessionToken($token) {
         LeanClient::getStorage()->set("LC_SessionToken", $token);
     }
 

tests/LeanFileTest.php

@@ -110,5 +110,6 @@ public function testSaveObjectWithFile() {
         $file->destroy();
         $obj->destroy();
     }
+
 }
 

tests/LeanUserTest.php

@@ -2,6 +2,7 @@
 
 use LeanCloud\LeanClient;
 use LeanCloud\LeanUser;
+use LeanCloud\LeanFile;
 use LeanCloud\CloudException;
 use LeanCloud\Storage\SessionStorage;
 
@@ -176,5 +177,26 @@ public function testUnlinkService() {
         $user2->destroy();
     }
 
+    /*
+     * Get current user with file attribute will result
+     * circular invoking getCurrentUser.
+     *
+     * @link github.com/leancloud/php-sdk#48
+     */
+    public function testCircularGetCurrentUser() {
+        // ensure getCurrentUser neither run indefinetely, nor throw maximum
+        // function all error
+        $avatar = LeanFile::createWithUrl("alice.png", "https://leancloud.cn/favicon.png");
+        $user = LeanUser::logIn("alice", "blabla");
+        $user->set("avatar", $avatar);
+        $user->save();
+        $token = LeanUser::getCurrentSessionToken();
+        $user->logOut();
+        LeanUser::setCurrentSessionToken($token);
+
+        $user2 = LeanUser::getCurrentUser();
+        $this->assertEquals($user2->getUsername(), "alice");
+    }
+
 }