kw_cache - updated storage

alex-kalanis · Aug 3, 2023 · f04746f · f04746f
1 parent 07494dc
commit f04746f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -7,14 +7,14 @@
     "license": "BSD-3-Clause",
     "type": "library",
     "require": {
-        "alex-kalanis/kw_paths": ">=3.0",
-        "alex-kalanis/kw_semaphore": ">=1.0",
+        "alex-kalanis/kw_paths": ">=3.0 <4",
+        "alex-kalanis/kw_semaphore": ">=1.0 <2",
         "ext-json": "*",
         "php": ">=7.3"
     },
     "require-dev": {
-        "alex-kalanis/kw_storage": ">=3.3",
-        "alex-kalanis/kw_files": ">=3.3",
+        "alex-kalanis/kw_storage": ">=4.0 <5",
+        "alex-kalanis/kw_files": ">=3.3 <4",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",

diff --git a/php-tests/CacheTests/ACacheTest.php b/php-tests/CacheTests/ACacheTest.php
@@ -8,13 +8,19 @@
 use kalanis\kw_storage\Interfaces\IStorage;
 use kalanis\kw_storage\Interfaces\ITarget;
 use kalanis\kw_storage\Storage as XStorage;
+use kalanis\kw_storage\StorageException;
 
 
 abstract class ACacheTest extends \CommonTestClass
 {
+    /**
+     * @param ITarget $mockStorage
+     * @throws StorageException
+     * @return IStorage
+     */
     protected function getStorage(ITarget $mockStorage): IStorage
     {
-        XStorage\Key\DirKey::setDir(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR);
+        XStorage\Key\StaticPrefixKey::setPrefix(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR);
         $storage = new XStorage\Factory(new XStorage\Key\Factory(), new XStorage\Target\Factory());
         return $storage->getStorage($mockStorage);
     }

diff --git a/php-tests/CacheTests/SemaphoreTest.php b/php-tests/CacheTests/SemaphoreTest.php
@@ -9,13 +9,15 @@
 use kalanis\kw_semaphore\Semaphore;
 use kalanis\kw_semaphore\SemaphoreException;
 use kalanis\kw_storage\Interfaces\IStorage;
+use kalanis\kw_storage\StorageException;
 
 
 class SemaphoreTest extends ACacheTest
 {
     /**
      * @throws CacheException
      * @throws SemaphoreException
+     * @throws StorageException
      */
     public function testRun(): void
     {
@@ -39,6 +41,7 @@ public function testRun(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotSet(): void
     {
@@ -54,6 +57,7 @@ public function testNotSet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testFailExists(): void
     {
@@ -69,6 +73,7 @@ public function testFailExists(): void
     /**
      * @throws CacheException
      * @throws SemaphoreException
+     * @throws StorageException
      */
     public function testFailSet(): void
     {

diff --git a/php-tests/StorageTests/AStorageTest.php b/php-tests/StorageTests/AStorageTest.php
@@ -6,17 +6,19 @@
 use kalanis\kw_storage\Interfaces\IStorage;
 use kalanis\kw_storage\Interfaces\ITarget;
 use kalanis\kw_storage\Storage as XStorage;
+use kalanis\kw_storage\StorageException;
 
 
 abstract class AStorageTest extends \CommonTestClass
 {
     /**
      * @param ITarget|string $mockStorage
+     * @throws StorageException
      * @return IStorage
      */
     protected function getStorage($mockStorage): IStorage
     {
-        XStorage\Key\DirKey::setDir(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR);
+        XStorage\Key\StaticPrefixKey::setPrefix(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR);
         $storage = new XStorage\Factory(new XStorage\Key\Factory(), new XStorage\Target\Factory());
         return $storage->getStorage($mockStorage);
     }

diff --git a/php-tests/StorageTests/BasicTest.php b/php-tests/StorageTests/BasicTest.php
@@ -5,12 +5,14 @@
 
 use kalanis\kw_cache\CacheException;
 use kalanis\kw_cache\Storage;
+use kalanis\kw_storage\StorageException;
 
 
 class BasicTest extends AStorageTest
 {
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testRun(): void
     {
@@ -28,6 +30,7 @@ public function testRun(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotExists(): void
     {
@@ -39,6 +42,7 @@ public function testNotExists(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotSet(): void
     {
@@ -50,6 +54,7 @@ public function testNotSet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotGet(): void
     {
@@ -61,6 +66,7 @@ public function testNotGet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotClear(): void
     {

diff --git a/php-tests/StorageTests/SemaphoreTest.php b/php-tests/StorageTests/SemaphoreTest.php
@@ -8,13 +8,15 @@
 use kalanis\kw_semaphore\Semaphore;
 use kalanis\kw_semaphore\SemaphoreException;
 use kalanis\kw_storage\Interfaces\IStorage;
+use kalanis\kw_storage\StorageException;
 
 
 class SemaphoreTest extends AStorageTest
 {
     /**
      * @throws CacheException
      * @throws SemaphoreException
+     * @throws StorageException
      */
     public function testRun(): void
     {
@@ -39,6 +41,7 @@ public function testRun(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotSet(): void
     {
@@ -55,6 +58,7 @@ public function testNotSet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testFailExists(): void
     {
@@ -68,6 +72,7 @@ public function testFailExists(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testCannotSet(): void
     {
@@ -80,6 +85,7 @@ public function testCannotSet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotGet(): void
     {
@@ -92,6 +98,7 @@ public function testNotGet(): void
 
     /**
      * @throws CacheException
+     * @throws StorageException
      */
     public function testNotClear(): void
     {
@@ -105,6 +112,7 @@ public function testNotClear(): void
     /**
      * @throws CacheException
      * @throws SemaphoreException
+     * @throws StorageException
      */
     public function testFailSet(): void
     {