Merge pull request #264 from bowphp/feat-integrate-queue-adapters

Change cache method to store
bowphp · Sep 22, 2023 · c3a2aca · c3a2aca
2 parents c0c7624 + 43f27ab
commit c3a2aca
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
@@ -57,7 +57,7 @@ public static function configure(array $config)
         static::$config = $config;
         $store = (array) $config["stores"][$config["default"]];
 
-        return static::cache($store["driver"]);
+        return static::store($store["driver"]);
     }
 
     /**
@@ -80,7 +80,7 @@ public static function getInstance(): CacheAdapterInterface
      * @param string $driver
      * @return CacheAdapterInterface
      */
-    public static function cache(string $store): CacheAdapterInterface
+    public static function store(string $store): CacheAdapterInterface
     {
         $stores = static::$config["stores"];
 

diff --git a/src/Cache/README.md b/src/Cache/README.md
@@ -16,7 +16,7 @@ $content = cache("name");
 By specifying the driver:
 
 ```
-$content = Cache::cache('redis')->get('name');
+$content = Cache::store('redis')->get('name');
 ```
 
 Is very enjoyful api
diff --git a/src/Database/Barry/Relations/BelongsTo.php b/src/Database/Barry/Relations/BelongsTo.php
@@ -52,7 +52,7 @@ public function __construct(
     public function getResults(): ?Model
     {
         $key = $this->query->getTable() . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;
-        $cache = Cache::cache('file')->get($key);
+        $cache = Cache::store('file')->get($key);
 
         if (!is_null($cache)) {
             $related = new $this->related();
@@ -63,7 +63,7 @@ public function getResults(): ?Model
         $result = $this->query->first();
 
         if (!is_null($result)) {
-            Cache::cache('file')->add($key, $result->toArray(), 500);
+            Cache::store('file')->add($key, $result->toArray(), 500);
         }
 
         return $result;

diff --git a/src/Database/Barry/Relations/HasOne.php b/src/Database/Barry/Relations/HasOne.php
@@ -50,7 +50,7 @@ public function __construct(Model $related, Model $parent, string $foreign_key,
     public function getResults(): ?Model
     {
         $key = $this->query->getTable() . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;
-        $cache = Cache::cache('file')->get($key);
+        $cache = Cache::store('file')->get($key);
 
         if (!is_null($cache)) {
             $related = new $this->related();
@@ -61,7 +61,7 @@ public function getResults(): ?Model
         $result = $this->query->first();
 
         if (!is_null($result)) {
-            Cache::cache('file')->add($key, $result->toArray(), 500);
+            Cache::store('file')->add($key, $result->toArray(), 60);
         }
 
         return $result;

diff --git a/tests/Cache/CacheDatabaseTest.php b/tests/Cache/CacheDatabaseTest.php
@@ -23,7 +23,7 @@ public static function setUpBeforeClass(): void
             )");
 
         Cache::configure($config["cache"]);
-        Cache::cache("database");
+        Cache::store("database");
     }
 
     public function test_create_cache()

diff --git a/tests/Cache/CacheFilesystemTest.php b/tests/Cache/CacheFilesystemTest.php
@@ -12,7 +12,7 @@ protected function setUp(): void
         parent::setUp();
         $config = TestingConfiguration::getConfig();
         Cache::configure($config["cache"]);
-        Cache::cache("file");
+        Cache::store("file");
     }
 
     public function test_create_cache()

diff --git a/tests/Cache/CacheRedisTest.php b/tests/Cache/CacheRedisTest.php
@@ -12,7 +12,7 @@ protected function setUp(): void
         parent::setUp();
         $config = TestingConfiguration::getConfig();
         Cache::configure($config["cache"]);
-        Cache::cache("redis");
+        Cache::store("redis");
     }
 
     public function test_create_cache()

diff --git a/tests/Database/Relation/BelongsToRelationQueryTest.php b/tests/Database/Relation/BelongsToRelationQueryTest.php
@@ -2,19 +2,21 @@
 
 namespace Bow\Tests\Database\Relation;
 
+use Bow\Cache\Cache;
 use Bow\Database\Database;
 use Bow\Database\Migration\SQLGenerator;
 use Bow\Tests\Config\TestingConfiguration;
-use Bow\Tests\Database\Stubs\MigrationExtendedStub;
-use Bow\Tests\Database\Stubs\PetMasterModelStub;
 use Bow\Tests\Database\Stubs\PetModelStub;
+use Bow\Tests\Database\Stubs\PetMasterModelStub;
+use Bow\Tests\Database\Stubs\MigrationExtendedStub;
 
 class BelongsToRelationQueryTest extends \PHPUnit\Framework\TestCase
 {
     public static function setUpBeforeClass(): void
     {
         $config = TestingConfiguration::getConfig();
         Database::configure($config["database"]);
+        Cache::configure($config["cache"]);
     }
 
     public function connectionNames()