diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 45fd98da..6d0a4072 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - php: [7.4, 8.0, 8.1, 8.2] + php: [7.4, 8.0, 8.1, 8.2, 8.3] laravel: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] @@ -25,18 +25,26 @@ jobs: php: 8.1 - laravel: 6.* php: 8.2 + - laravel: 6.* + php: 8.3 - laravel: 7.* php: 8.1 - laravel: 7.* php: 8.2 + - laravel: 7.* + php: 8.3 - laravel: 8.* php: 8.2 stability: prefer-lowest + - laravel: 8.* + php: 8.3 - laravel: 9.* php: 7.4 - laravel: 9.* php: 8.2 stability: prefer-lowest + - laravel: 9.* + php: 8.3 - laravel: 10.* php: 7.4 - laravel: 10.* diff --git a/composer.json b/composer.json index c1e0eb34..3b24fb7e 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "illuminate/support": "^6|^7|^8.67|^9|^10|^11", "lcobucci/jwt": "^4.0", "namshi/jose": "^7.0", - "nesbot/carbon": "^1.0|^2.0" + "nesbot/carbon": "^2.0|^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3", diff --git a/src/Blacklist.php b/src/Blacklist.php index 07e79ef9..746c96d8 100644 --- a/src/Blacklist.php +++ b/src/Blacklist.php @@ -95,7 +95,7 @@ protected function getMinutesUntilExpired(Payload $payload) // get the latter of the two expiration dates and find // the number of minutes until the expiration date, // plus 1 minute to avoid overlap - return $exp->max($iat->addMinutes($this->refreshTTL))->addMinute()->diffInRealMinutes(); + return round($exp->max($iat->addMinutes($this->refreshTTL))->addMinute()->diffInRealMinutes(null, true)); } /**