cleanup DateTime handline

* DateTime -> DateTimeImmutable
* DateTime::format('U') -> DateTime::getTimestamp()
* (new DateTime())->getTimestamp() -> time()
This commit is contained in:
Marc Bennewitz
2018-11-08 10:41:01 +01:00
parent fe421878e6
commit 16f9de86f2
24 changed files with 202 additions and 177 deletions

View File

@@ -9,6 +9,8 @@
namespace League\OAuth2\Server\Entities;
use DateTimeImmutable;
interface RefreshTokenEntityInterface
{
/**
@@ -28,16 +30,16 @@ interface RefreshTokenEntityInterface
/**
* Get the token's expiry date time.
*
* @return \DateTime
* @return DateTimeImmutable
*/
public function getExpiryDateTime();
public function getExpiryDateTime(): DateTimeImmutable;
/**
* Set the date time when the token expires.
*
* @param \DateTime $dateTime
* @param DateTimeImmutable $dateTime
*/
public function setExpiryDateTime(\DateTime $dateTime);
public function setExpiryDateTime(DateTimeImmutable $dateTime);
/**
* Set the access token that the refresh token was associated with.

View File

@@ -9,6 +9,8 @@
namespace League\OAuth2\Server\Entities;
use DateTimeImmutable;
interface TokenInterface
{
/**
@@ -28,16 +30,16 @@ interface TokenInterface
/**
* Get the token's expiry date time.
*
* @return \DateTime
* @return DateTimeImmutable
*/
public function getExpiryDateTime();
public function getExpiryDateTime(): DateTimeImmutable;
/**
* Set the date time when the token expires.
*
* @param \DateTime $dateTime
* @param DateTimeImmutable $dateTime
*/
public function setExpiryDateTime(\DateTime $dateTime);
public function setExpiryDateTime(DateTimeImmutable $dateTime);
/**
* Set the identifier of the user associated with the token.

View File

@@ -9,6 +9,7 @@
namespace League\OAuth2\Server\Entities\Traits;
use DateTimeImmutable;
use Lcobucci\JWT\Builder;
use Lcobucci\JWT\Signer\Key;
use Lcobucci\JWT\Signer\Rsa\Sha256;
@@ -67,9 +68,9 @@ trait AccessTokenTrait
abstract public function getClient();
/**
* @return \DateTime
* @return DateTimeImmutable
*/
abstract public function getExpiryDateTime();
abstract public function getExpiryDateTime(): DateTimeImmutable;
/**
* @return string|int

View File

@@ -9,6 +9,7 @@
namespace League\OAuth2\Server\Entities\Traits;
use DateTimeImmutable;
use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
trait RefreshTokenTrait
@@ -19,7 +20,7 @@ trait RefreshTokenTrait
protected $accessToken;
/**
* @var \DateTime
* @var DateTimeImmutable
*/
protected $expiryDateTime;
@@ -42,9 +43,9 @@ trait RefreshTokenTrait
/**
* Get the token's expiry date time.
*
* @return \DateTime
* @return DateTimeImmutable
*/
public function getExpiryDateTime()
public function getExpiryDateTime(): DateTimeImmutable
{
return $this->expiryDateTime;
}
@@ -52,9 +53,9 @@ trait RefreshTokenTrait
/**
* Set the date time when the token expires.
*
* @param \DateTime $dateTime
* @param DateTimeImmutable $dateTime
*/
public function setExpiryDateTime(\DateTime $dateTime)
public function setExpiryDateTime(DateTimeImmutable $dateTime)
{
$this->expiryDateTime = $dateTime;
}

View File

@@ -9,6 +9,7 @@
namespace League\OAuth2\Server\Entities\Traits;
use DateTimeImmutable;
use League\OAuth2\Server\Entities\ClientEntityInterface;
use League\OAuth2\Server\Entities\ScopeEntityInterface;
@@ -20,7 +21,7 @@ trait TokenEntityTrait
protected $scopes = [];
/**
* @var \DateTime
* @var DateTimeImmutable
*/
protected $expiryDateTime;
@@ -57,9 +58,9 @@ trait TokenEntityTrait
/**
* Get the token's expiry date time.
*
* @return \DateTime
* @return DateTimeImmutable
*/
public function getExpiryDateTime()
public function getExpiryDateTime(): DateTimeImmutable
{
return $this->expiryDateTime;
}
@@ -67,9 +68,9 @@ trait TokenEntityTrait
/**
* Set the date time when the token expires.
*
* @param \DateTime $dateTime
* @param DateTimeImmutable $dateTime
*/
public function setExpiryDateTime(\DateTime $dateTime)
public function setExpiryDateTime(DateTimeImmutable $dateTime)
{
$this->expiryDateTime = $dateTime;
}