From 2b7e4fd5fbef61114812c1653c91ce6820e4b60d Mon Sep 17 00:00:00 2001 From: dschobert Date: Mon, 14 Sep 2020 08:21:36 +0200 Subject: [PATCH] replaced deprecated methods of lcobucci/jwt --- src/JWTHandler.php | 15 ++++++++------- tests/JWTHelper.php | 13 +++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/JWTHandler.php b/src/JWTHandler.php index 5ab5800..3ba2caa 100644 --- a/src/JWTHandler.php +++ b/src/JWTHandler.php @@ -5,6 +5,7 @@ use Lcobucci\JWT\Builder; use Lcobucci\JWT\Parser; use Lcobucci\JWT\Signer; +use Lcobucci\JWT\Signer\Key; use SPie\LaravelJWT\Contracts\JWT; use SPie\LaravelJWT\Contracts\JWTFactory; use SPie\LaravelJWT\Contracts\JWTHandler as JWTHandlerContract; @@ -178,23 +179,23 @@ public function getValidJWT(string $token): JWT */ public function createJWT(string $subject, array $payload = [], int $ttl = null): JWT { - list($issuedAt, $expiresAt) = $this->createTimestamps($ttl); + [$issuedAt, $expiresAt] = $this->createTimestamps($ttl); $builder = $this->getNewBuilder() - ->setIssuer($this->getIssuer()) - ->setSubject($subject) - ->setIssuedAt($issuedAt); + ->issuedBy($this->getIssuer()) + ->relatedTo($subject) + ->issuedAt($issuedAt); if ($expiresAt) { - $builder->setExpiration($expiresAt); + $builder->expiresAt($expiresAt); } foreach ($payload as $name => $value) { - $builder->set($name, $value); + $builder->withClaim($name, $value); } return $this->getJWTFactory()->createJWT( - $builder->sign($this->getSigner(), $this->getSecret())->getToken() + $builder->getToken($this->getSigner(), new Key($this->getSecret())) ); } diff --git a/tests/JWTHelper.php b/tests/JWTHelper.php index e6d0523..9725112 100644 --- a/tests/JWTHelper.php +++ b/tests/JWTHelper.php @@ -204,22 +204,19 @@ protected function createBuilder(Token $token = null): Builder $builder = Mockery::spy(Builder::class); return $builder - ->shouldReceive('setIssuer') + ->shouldReceive('issuedBy') ->andReturn($builder) ->getMock() - ->shouldReceive('setSubject') + ->shouldReceive('relatedTo') ->andReturn($builder) ->getMock() - ->shouldReceive('setIssuedAt') + ->shouldReceive('issuedAt') ->andReturn($builder) ->getMock() - ->shouldReceive('setExpiration') + ->shouldReceive('expiresAt') ->andReturn($builder) ->getMock() - ->shouldReceive('set') - ->andReturn($builder) - ->getMock() - ->shouldReceive('sign') + ->shouldReceive('withClaim') ->andReturn($builder) ->getMock() ->shouldReceive('getToken')