(fix) Datetime test

leancloud · Mar 17, 2018 · c9ef636 · c9ef636
1 parent f5aeeb3
commit c9ef636
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php
@@ -620,7 +620,8 @@ public static function formatDate($date) {
         $utc = clone $date;
         $utc->setTimezone(new \DateTimezone("UTC"));
         $iso = $utc->format("Y-m-d\TH:i:s.u");
-        // chops 3 zeros of microseconds to comply with cloud date format
+        // Milliseconds precision is required for server to correctly parse time,
+        // thus we have to chop off last 3 microseconds to milliseconds.
         $iso = substr($iso, 0, 23) . "Z";
         return $iso;
     }
@@ -652,7 +653,9 @@ public static function decode($value, $key) {
 
         if ($type === "Date") {
             // return time in default time zone
-            return new \DateTime($value["iso"]);
+            $date = new \DateTime($value["iso"]);
+            $date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+            return $date;
         }
         if ($type === "Bytes") {
             return Bytes::createFromBase64Data($value["base64"]);

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -175,7 +175,9 @@ public function testDecodeDate() {
         $date = new DateTime();
         $type = array("__type" => "Date",
                       "iso" => Client::formatDate($date));
-        $this->assertEquals($date, Client::decode($type, null));
+        $date2 = Client::decode($type, null);
+        $this->assertEquals($date->getTimestamp(),
+                            $date2->getTimestamp());
     }
 
     public function testDecodeDateWithTimeZone() {
@@ -185,7 +187,9 @@ public function testDecodeDateWithTimeZone() {
             $date = new DateTime("now", new DateTimeZone($zone));
             $type = array("__type" => "Date",
                           "iso" => Client::formatDate($date));
-            $this->assertEquals($date, Client::decode($type, null));
+            $date2 = Client::decode($type, null);
+            $this->assertEquals($date->getTimestamp(),
+                                $date2->getTimestamp());
         }
     }
 

diff --git a/test/ObjectTest.php b/test/ObjectTest.php
@@ -225,7 +225,8 @@ public function testGetDateShouldReturnDateTime() {
         $obj2 = new Object("TestObject", $obj->getObjectId());
         $obj2->fetch();
         $this->assertTrue($obj2->get("release") instanceof DateTime);
-        $this->assertEquals($obj->get("release"), $obj2->get("release"));
+        $this->assertEquals($obj->get("release")->getTimestamp(),
+                            $obj2->get("release")->getTimestamp());
 
         $obj2->destroy();
     }

diff --git a/test/PushTest.php b/test/PushTest.php
@@ -97,7 +97,8 @@ public function testSetPushTime() {
         $time = new DateTime();
         $push->setPushTime($time);
         $out = $push->encode();
-        $this->assertEquals($time, new DateTime($out["push_time"]));
+        $time2 = new DateTime($out["push_time"]);
+        $this->assertEquals($time->getTimestamp(), $time2->getTimestamp());
     }
 
     public function testSetExpirationInterval() {
@@ -116,7 +117,8 @@ public function testSetExpirationTime() {
         $date = new DateTime();
         $push->setExpirationTime($date);
         $out = $push->encode();
-        $this->assertEquals($date, new DateTime($out["expiration_time"]));
+        $date2 = new DateTime($out["expiration_time"]);
+        $this->assertEquals($date->getTimestamp(), $date2->getTimestamp());
     }
 
     public function testSetWhere() {