Renamed classes

Sammyjo20 · Sammyjo20 · commit 732606ebdec6 · 2022-04-20T20:13:48.000+01:00
diff --git a/src/Drivers/FlysystemDriver.php b/src/Drivers/FlysystemDriver.php
@@ -5,9 +5,9 @@
 use League\Flysystem\Filesystem;
 use League\Flysystem\UnableToReadFile;
 use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
 
-class FlysystemDriverInterface implements CacheDriverInterface
+class FlysystemDriver implements DriverInterface
 {
     /**
      * @param Filesystem $store
diff --git a/src/Drivers/LaravelCacheDriver.php b/src/Drivers/LaravelCacheDriver.php
@@ -4,9 +4,9 @@
 
 use Illuminate\Contracts\Cache\Repository;
 use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
 
-class LaravelCacheDriverInterface implements CacheDriverInterface
+class LaravelCacheDriver implements DriverInterface
 {
     /**
      * @param Repository $store
diff --git a/src/Drivers/SimpleCacheDriver.php b/src/Drivers/SimpleCacheDriver.php
@@ -4,12 +4,12 @@
 
 use Psr\SimpleCache\CacheInterface;
 use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
 
 /**
  * PSR-16 Cache Driver
  */
-class SimpleCacheDriverInterface implements CacheDriverInterface
+class SimpleCacheDriver implements DriverInterface
 {
     /**
      * @param CacheInterface $store
diff --git a/src/Http/Middleware/ExplicitCacheMiddleware.php b/src/Http/Middleware/ExplicitCacheMiddleware.php
@@ -8,7 +8,7 @@
 use GuzzleHttp\Promise\FulfilledPromise;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
 
 class ExplicitCacheMiddleware
 {
@@ -22,9 +22,9 @@ class ExplicitCacheMiddleware
     /**
      * The cache driver used for caching.
      *
-     * @var CacheDriverInterface
+     * @var DriverInterface
      */
-    protected CacheDriverInterface $cacheDriver;
+    protected DriverInterface $cacheDriver;
 
     /**
      * The TTL in seconds.
diff --git a/src/Interfaces/DriverInterface.php b/src/Interfaces/DriverInterface.php
@@ -4,7 +4,7 @@
 
 use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;
 
-interface CacheDriverInterface
+interface DriverInterface
 {
     /**
      * Store the cached response on the driver.
diff --git a/src/Traits/AlwaysCacheResponses.php b/src/Traits/AlwaysCacheResponses.php
@@ -5,7 +5,7 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use Sammyjo20\Saloon\Http\SaloonResponse;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
 use Sammyjo20\SaloonCachePlugin\Http\Middleware\ExplicitCacheMiddleware;
 
 trait AlwaysCacheResponses
@@ -145,7 +145,7 @@ public function invalidateCache(): self
      *
      * @return mixed
      */
-    abstract public function cacheDriver(): CacheDriverInterface;
+    abstract public function cacheDriver(): DriverInterface;
 
     /**
      * Define the cache TTL (Time-to-live) in seconds.
diff --git a/tests/Fixtures/Connectors/CachedConnector.php b/tests/Fixtures/Connectors/CachedConnector.php
@@ -5,8 +5,8 @@
 use League\Flysystem\Filesystem;
 use Sammyjo20\Saloon\Http\SaloonConnector;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 
 class CachedConnector extends SaloonConnector
@@ -18,9 +18,9 @@ public function defineBaseUrl(): string
         return testApi();
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/AdvancedCustomKeyCachedUserRequest.php b/tests/Fixtures/Requests/AdvancedCustomKeyCachedUserRequest.php
@@ -6,8 +6,8 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -24,9 +24,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/CachedPostRequest.php b/tests/Fixtures/Requests/CachedPostRequest.php
@@ -7,8 +7,8 @@
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -33,9 +33,9 @@ public function defaultData(): array
         ];
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/CachedUserRequest.php b/tests/Fixtures/Requests/CachedUserRequest.php
@@ -6,8 +6,8 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -24,9 +24,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/CachedUserRequestOnCachedConnector.php b/tests/Fixtures/Requests/CachedUserRequestOnCachedConnector.php
@@ -6,8 +6,8 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\CachedConnector;
 
@@ -24,9 +24,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath() . '/custom')));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath() . '/custom')));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/CustomKeyCachedUserRequest.php b/tests/Fixtures/Requests/CustomKeyCachedUserRequest.php
@@ -6,8 +6,8 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -24,9 +24,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/LaravelCachedUserRequest.php b/tests/Fixtures/Requests/LaravelCachedUserRequest.php
@@ -5,8 +5,8 @@
 use Illuminate\Support\Facades\Cache;
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\LaravelCacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\LaravelCacheDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -23,9 +23,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new LaravelCacheDriverInterface(Cache::store('file'));
+        return new LaravelCacheDriver(Cache::store('file'));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/ShortLifeCachedUserRequest.php b/tests/Fixtures/Requests/ShortLifeCachedUserRequest.php
@@ -6,8 +6,8 @@
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
 
@@ -24,9 +24,9 @@ public function defineEndpoint(): string
         return '/user';
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));
+        return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));
     }
 
     public function cacheTTLInSeconds(): int
diff --git a/tests/Fixtures/Requests/SimpleCachedUserRequest.php b/tests/Fixtures/Requests/SimpleCachedUserRequest.php
@@ -4,8 +4,8 @@
 
 use Sammyjo20\Saloon\Constants\Saloon;
 use Sammyjo20\Saloon\Http\SaloonRequest;
-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;
-use Sammyjo20\SaloonCachePlugin\Drivers\SimpleCacheDriverInterface;
+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;
+use Sammyjo20\SaloonCachePlugin\Drivers\SimpleCacheDriver;
 use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Stores\ArrayCache;
 use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;
@@ -28,9 +28,9 @@ public function __construct(protected ArrayCache $cache)
         //
     }
 
-    public function cacheDriver(): CacheDriverInterface
+    public function cacheDriver(): DriverInterface
     {
-        return new SimpleCacheDriverInterface($this->cache);
+        return new SimpleCacheDriver($this->cache);
     }
 
     public function cacheTTLInSeconds(): int

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Sammyjo20\SaloonCachePlugin\Data\CachedResponse;`
`6`	`6`
`7`		`-interface CacheDriverInterface`
	`7`	`+interface DriverInterface`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Store the cached response on the driver.`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`use League\Flysystem\Filesystem;`
`6`	`6`	`use Sammyjo20\Saloon\Http\SaloonConnector;`
`7`	`7`	`use League\Flysystem\Local\LocalFilesystemAdapter;`
`8`		`-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;`
`9`		`-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;`
	`8`	`+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;`
	`9`	`+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;`
`10`	`10`	`use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;`
`11`	`11`
`12`	`12`	`class CachedConnector extends SaloonConnector`
`@@ -18,9 +18,9 @@ public function defineBaseUrl(): string`
`18`	`18`	`return testApi();`
`19`	`19`	`}`
`20`	`20`
`21`		`- public function cacheDriver(): CacheDriverInterface`
	`21`	`+ public function cacheDriver(): DriverInterface`
`22`	`22`	`{`
`23`		`- return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
	`23`	`+ return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function cacheTTLInSeconds(): int`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`use Sammyjo20\Saloon\Constants\Saloon;`
`7`	`7`	`use Sammyjo20\Saloon\Http\SaloonRequest;`
`8`	`8`	`use League\Flysystem\Local\LocalFilesystemAdapter;`
`9`		`-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;`
`10`		`-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;`
	`9`	`+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;`
	`10`	`+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;`
`11`	`11`	`use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;`
`12`	`12`	`use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;`
`13`	`13`
`@@ -24,9 +24,9 @@ public function defineEndpoint(): string`
`24`	`24`	`return '/user';`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function cacheDriver(): CacheDriverInterface`
	`27`	`+ public function cacheDriver(): DriverInterface`
`28`	`28`	`{`
`29`		`- return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
	`29`	`+ return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function cacheTTLInSeconds(): int`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`use Sammyjo20\Saloon\Http\SaloonRequest;`
`8`	`8`	`use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;`
`9`	`9`	`use League\Flysystem\Local\LocalFilesystemAdapter;`
`10`		`-use Sammyjo20\SaloonCachePlugin\Interfaces\CacheDriverInterface;`
`11`		`-use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriverInterface;`
	`10`	`+use Sammyjo20\SaloonCachePlugin\Interfaces\DriverInterface;`
	`11`	`+use Sammyjo20\SaloonCachePlugin\Drivers\FlysystemDriver;`
`12`	`12`	`use Sammyjo20\SaloonCachePlugin\Traits\AlwaysCacheResponses;`
`13`	`13`	`use Sammyjo20\SaloonCachePlugin\Tests\Fixtures\Connectors\TestConnector;`
`14`	`14`
`@@ -33,9 +33,9 @@ public function defaultData(): array`
`33`	`33`	`];`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function cacheDriver(): CacheDriverInterface`
	`36`	`+ public function cacheDriver(): DriverInterface`
`37`	`37`	`{`
`38`		`- return new FlysystemDriverInterface(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
	`38`	`+ return new FlysystemDriver(new Filesystem(new LocalFilesystemAdapter(cachePath())));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function cacheTTLInSeconds(): int`