Merge pull request #261 from PHP-Open-Source-Saver/bugfix/260-carbon-…

…diffin-methods

Cater for both Carbon v2 and v3 - issue #260

.github/workflows/phpunit.yml

@@ -27,6 +27,9 @@ jobs:
             laravel: 11.*
             stability: prefer-stable
             coverage: xdebug
+          - php: 8.3
+            laravel: 11.*
+            carbon: 3.*
 
     name: 'P${{ matrix.php }} L${{ matrix.laravel }} ${{ matrix.stability }} c:${{ matrix.coverage }}'
 
@@ -55,6 +58,11 @@ jobs:
         run: |
           composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-progress --no-update
 
+      - name: Set carbon version
+        if: ${{ matrix.carbon }}
+        run: |
+          composer require "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-progress --no-update
+
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

src/Blacklist.php

@@ -95,7 +95,14 @@ 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 round($exp->max($iat->addMinutes($this->refreshTTL))->addMinute()->diffInRealMinutes(null, true));
+        $intermediateResult = $exp->max($iat->addMinutes($this->refreshTTL))->addMinute();
+
+        // Handle Carbon 2 vs 3 deprecation of "Real" diff functions, see https://github.com/PHP-Open-Source-Saver/jwt-auth/issues/260
+        if (method_exists($intermediateResult, 'diffInRealMinutes')) {
+            return round($intermediateResult->diffInRealMinutes(null, true));
+        } else {
+            return (int) round($intermediateResult->diffInMinutes(null, true));
+        }
     }
 
     /**