Merge pull request #83 from basz/timezone

take timezone into account
zf-fr · Feb 25, 2017 · a993ba3 · a993ba3
2 parents 37ccd7c + 5b7b565
commit a993ba3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Model/AbstractToken.php b/src/Model/AbstractToken.php
@@ -23,6 +23,7 @@
 
 use DateTime;
 use DateTimeInterface;
+use DateTimeZone;
 
 /**
  * Provide basic functionality for both access tokens, refresh tokens and authorization codes
@@ -94,7 +95,7 @@ protected static function createNew(
         $token->owner     = $owner;
         $token->client    = $client;
         $token->scopes    = $scopes ?? [];
-        $token->expiresAt = $ttl ? (new DateTime())->modify("+$ttl seconds") : null;
+        $token->expiresAt = $ttl ? (new DateTime('now', new DateTimeZone('UTC')))->modify("+$ttl seconds") : null;
 
         return $token;
     }
@@ -158,15 +159,15 @@ public function getExpiresAt()
      */
     public function getExpiresIn(): int
     {
-        return $this->expiresAt->getTimestamp() - (new DateTime('now'))->getTimestamp();
+        return $this->expiresAt->getTimestamp() - (new DateTime('now', new DateTimeZone('UTC')))->getTimestamp();
     }
 
     /**
      * Is the token expired?
      */
     public function isExpired(): bool
     {
-        return $this->expiresAt < new DateTime('now');
+        return $this->expiresAt < new DateTime('now', new DateTimeZone('UTC'));
     }
 
     /**