Merge pull request #114 from ljbergmann/1.0.0

fixed bug
Alpha-Trader · Nov 15, 2016 · 7d77466 · 7d77466
2 parents 69d8291 + 5581f82
commit 7d77466
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Api/Traits/TimeStampTrait.php b/src/Api/Traits/TimeStampTrait.php
@@ -17,6 +17,6 @@ trait TimeStampTrait
      */
     protected function formatTimeStamp($time)
     {
-        return $time ?: ($time instanceof \DateTime ? ($time->getTimestamp() * 1000) : ((int)$time * 1000)) ?: null;
+        return ($time instanceof \DateTime ? ($time->getTimestamp() * 1000) : ((int)$time * 1000)) ?: null;
     }
 }
diff --git a/tests/AlphaTraderApiTests/AlphaTraderTest.php b/tests/AlphaTraderApiTests/AlphaTraderTest.php
@@ -29,18 +29,22 @@ public function test_createClient()
     {
         self::assertInstanceOf(AlphaTrader::class, $this->alphatrader);
     }
-    
+
     public function test_formatTimeStamp()
     {
-        $timestamp = $this->invokeMethod($this->alphatrader, 'formatTimeStamp', array(new \DateTime()));
-        $this->assertInstanceOf('\DateTime', $timestamp);
+        $time = mt_rand(1262055681, 1474823143);
+        $date = new \DateTime();
+        $date->setTimestamp($time);
+        $timestamp = $this->invokeMethod($this->alphatrader, 'formatTimeStamp', array($date));
+        $this->assertTrue(is_int($timestamp));
         $timestamp = $this->invokeMethod($this->alphatrader, 'formatTimeStamp', array(null));
         $this->assertNull($timestamp);
-        $time = mt_rand(1262055681, 1474823143);
+
         $timestamp = $this->invokeMethod($this->alphatrader, 'formatTimeStamp', array($time));
         $this->assertTrue(is_int($timestamp));
     }
 
+
     /**
      * @return Bankaccount
      */