Revert UserFrosting\Cache\Cache

This cause issue further down the road. `Tags()` can return Repository for example.
userfrosting · Sep 29, 2023 · 6078a01 · 6078a01
1 parent 22cc608
commit 6078a01
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 30 deletions.
diff --git a/src/Alert/CacheAlertStream.php b/src/Alert/CacheAlertStream.php
@@ -12,8 +12,8 @@
 
 namespace UserFrosting\Alert;
 
+use Illuminate\Cache\Repository as Cache;
 use Illuminate\Cache\TaggedCache;
-use UserFrosting\Cache\Cache;
 use UserFrosting\I18n\Translator;
 
 /**

diff --git a/src/Cache/AbstractStore.php b/src/Cache/AbstractStore.php
@@ -12,6 +12,7 @@
 
 namespace UserFrosting\Cache;
 
+use Illuminate\Cache\Repository as Cache;
 use Illuminate\Contracts\Cache\Store;
 
 abstract class AbstractStore

diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
diff --git a/tests/Alert/CacheAlertStreamTest.php b/tests/Alert/CacheAlertStreamTest.php
@@ -10,12 +10,12 @@
 
 namespace UserFrosting\Tests\Alert;
 
+use Illuminate\Cache\Repository as Cache;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use UserFrosting\Alert\AlertStream;
 use UserFrosting\Alert\CacheAlertStream;
-use UserFrosting\Cache\Cache;
 use UserFrosting\I18n\Translator;
 
 class CacheAlertStreamTest extends TestCase

diff --git a/tests/Cache/CacheTest.php b/tests/Cache/CacheTest.php
@@ -12,10 +12,10 @@
 
 namespace UserFrosting\Tests\Cache;
 
+use Illuminate\Cache\Repository as Cache;
 use Illuminate\Contracts\Cache\Repository as CacheContract;
 use PHPUnit\Framework\TestCase;
 use UserFrosting\Cache\ArrayStore;
-use UserFrosting\Cache\Cache;
 use UserFrosting\Cache\FileStore;
 
 class CacheTest extends TestCase

diff --git a/tests/Cache/MemcachedStoreTest.php b/tests/Cache/MemcachedStoreTest.php
@@ -12,7 +12,7 @@
 
 namespace UserFrosting\Tests\Cache;
 
-use UserFrosting\Cache\Cache;
+use Illuminate\Cache\Repository as Cache;
 use UserFrosting\Cache\MemcachedStore;
 
 /**

diff --git a/tests/Cache/RedisStoreTest.php b/tests/Cache/RedisStoreTest.php
@@ -12,7 +12,7 @@
 
 namespace UserFrosting\Tests\Cache;
 
-use UserFrosting\Cache\Cache;
+use Illuminate\Cache\Repository as Cache;
 use UserFrosting\Cache\RedisStore;
 
 /**

diff --git a/tests/Cache/StoreTestCase.php b/tests/Cache/StoreTestCase.php
@@ -12,8 +12,8 @@
 
 namespace UserFrosting\Tests\Cache;
 
+use Illuminate\Cache\Repository as Cache;
 use PHPUnit\Framework\TestCase;
-use UserFrosting\Cache\Cache;
 
 abstract class StoreTestCase extends TestCase
 {

diff --git a/tests/Cache/TaggableFileStoreTest.php b/tests/Cache/TaggableFileStoreTest.php
@@ -12,7 +12,7 @@
 
 namespace UserFrosting\Tests\Cache;
 
-use UserFrosting\Cache\Cache;
+use Illuminate\Cache\Repository as Cache;
 use UserFrosting\Cache\TaggableFileStore;
 use UserFrosting\UniformResourceLocator\Normalizer;