Add support for epoch timestamps with milliseconds.

Author: jarnovanleeuwen

src/Entities/AbstractEntity.php

@@ -1,6 +1,7 @@
 <?php
 namespace PHPTikkie\Entities;
 
+use DateTimeImmutable;
 use PHPTikkie\PHPTikkie;
 
 abstract class AbstractEntity
@@ -33,4 +34,19 @@ public function setAttributes(array $attributes)
             }
         }
     }
+
+    /**
+     * Convert an ISO-8601 formatted string to DateTimeImmutable.
+     */
+    protected function toDateTime(string $representation): DateTimeImmutable
+    {
+        // Due to a Tikkie bug, the API may return epoch timestamps with milliseconds instead of a ISO-8601 formatted string.
+        // I reported this on 24-04-2019.
+        if (is_numeric($representation)) {
+            // Remove milliseconds and prepend with @ to mark as timestamp.
+            $representation = '@'.substr($representation, 0, 10);
+        }
+
+        return new DateTimeImmutable($representation);
+    }
 }

src/Entities/Payment.php

@@ -1,8 +1,6 @@
 <?php
 namespace PHPTikkie\Entities;
 
-use DateTimeImmutable;
-
 class Payment extends AbstractEntity
 {
     const STATUS_NEW = 'NEW';
@@ -26,7 +24,7 @@ class Payment extends AbstractEntity
     public $counterPartyName;
 
     /**
-     * @var DateTimeImmutable
+     * @var \DateTimeImmutable
      */
     public $created;
 
@@ -62,7 +60,7 @@ public function setAttributes(array $attributes)
         parent::setAttributes($attributes);
 
         if (isset($attributes['created'])) {
-            $this->created = new DateTimeImmutable($attributes['created']);
+            $this->created = $this->toDateTime($attributes['created']);
         }
     }
 }

src/Entities/PaymentRequest.php

@@ -1,8 +1,6 @@
 <?php
 namespace PHPTikkie\Entities;
 
-use DateTimeImmutable;
-
 class PaymentRequest extends AbstractEntity
 {
     const STATUS_OPEN = 'OPEN';
@@ -42,7 +40,7 @@ class PaymentRequest extends AbstractEntity
     public $description;
 
     /**
-     * @var DateTimeImmutable|null
+     * @var \DateTimeImmutable|null
      */
     public $expired;
 
@@ -95,7 +93,7 @@ public function setAttributes(array $attributes)
 
         foreach (['created', 'expired'] as $dateAttribute) {
             if (isset($attributes[$dateAttribute])) {
-                $this->{$dateAttribute} = new DateTimeImmutable($attributes[$dateAttribute]);
+                $this->{$dateAttribute} = $this->toDateTime($attributes[$dateAttribute]);
             }
         }
 

tests/FetchPaymentRequestTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPTikkie\Tests;
 
+use DateTimeImmutable;
 use PHPTikkie\Entities\Payment;
 use PHPTikkie\Entities\PaymentRequest;
 use PHPTikkie\Exceptions\RequestException;
@@ -52,4 +53,15 @@ public function testFetchPaymentRequestFailed()
 
         $this->tikkie->paymentRequest('platformtoken1', 'usertoken1', 'paymentrequesttoken1');
     }
+
+    // Due to a Tikkie bug, the API may return epoch timestamps with milliseconds instead of a ISO-8601 formatted string.
+    // I reported this on 24-04-2019.
+    public function testCreatedDateCanBeTimestampWithMilliseconds()
+    {
+        $payment = new Payment($this->tikkie);
+        $payment->setAttributes(['created' => '1554957274674']);
+
+        $this->assertInstanceOf(DateTimeImmutable::class, $payment->created);
+        $this->assertEquals('1554957274', $payment->created->getTimestamp());
+    }
 }