bugfix. #10

Author: overtrue

phpunit.xml.dist

@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Application Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/CacheTokenRepository.php

@@ -53,9 +53,9 @@ public function __construct(string $cacheKeyPrefix = null, int $expiresInSeconds
      *
      * @return \Laravel\Passport\Token
      */
-    public function find($id)
+    public function find($id): Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($id),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($id) {
@@ -72,9 +72,9 @@ function () use ($id) {
      *
      * @return \Laravel\Passport\Token|null
      */
-    public function findForUser($id, $userId)
+    public function findForUser($id, $userId): ?Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($id),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($id, $userId) {
@@ -92,7 +92,7 @@ function () use ($id, $userId) {
      */
     public function forUser($userId): Collection
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($userId),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($userId) {
@@ -109,9 +109,9 @@ function () use ($userId) {
      *
      * @return \Laravel\Passport\Token|null
      */
-    public function getValidToken($user, $client)
+    public function getValidToken($user, $client): ?Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($user->getKey()),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($client, $user) {
@@ -124,22 +124,22 @@ function () use ($client, $user) {
         );
     }
 
-    public function itemKey(string $key)
+    public function itemKey(string $key): string
     {
         return $this->cacheKeyPrefix . $key;
     }
 
-    public function store(): Repository
+    public function cacheStore(): Repository
     {
         $store = Cache::store($this->cacheStore);
 
-        return $store instanceof TaggableStore ? $store->tags($this->cacheTags) : $store;
+        return $store->getStore() instanceof TaggableStore ? $store->tags($this->cacheTags) : $store;
     }
 
     public function revokeAccessToken($id)
     {
         parent::revokeAccessToken($id);
 
-        $this->store()->forget($this->itemKey($id));
+        $this->cacheStore()->forget($this->itemKey($id));
     }
 }

tests/FeatureTest.php

@@ -6,7 +6,6 @@
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
@@ -100,13 +99,13 @@ public function test_it_can_cache_token()
 
         // revoke token
         $token = $tokenRepository->findValidToken($user, $client);
-        $this->assertTrue(Cache::has(app(TokenRepository::class)->itemKey($token->id)));
+        $this->assertTrue($tokenRepository->cacheStore()->has(app(TokenRepository::class)->itemKey($token->id)));
 
         $tokenRepository->revokeAccessToken($token->id);
         $token->refresh();
         $this->assertTrue($token->revoked);
 
-        $this->assertFalse(Cache::has($tokenRepository->itemKey($token->id)));
+        $this->assertFalse($tokenRepository->cacheStore()->has($tokenRepository->itemKey($token->id)));
 
         // logout
         RequestGuard::macro('logout', function () {