Catch exceptions in fetch()

Signed-off-by: Tom Wright <[email protected]>

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Catch exceptions in fetch()
+* Added unlock to items
+
 ## v0.3.0 (2023-11-14)
 * Renamed enums to PascalCase
 

src/Stash/Item.php

@@ -435,6 +435,21 @@ public function lock(
         );
     }
 
+    /**
+     * Remove lock entry
+     */
+    public function unlock(): void
+    {
+        if (!$this->locked) {
+            return;
+        }
+
+        $this->store->getDriver()->deleteLock(
+            $this->store->getNamespace(),
+            $this->key
+        );
+    }
+
     /**
      * Store item to driver
      */

src/Stash/Store/Generic.php

@@ -21,6 +21,7 @@
 
 use Psr\Cache\CacheItemInterface as CacheItem;
 use Psr\Cache\InvalidArgumentException as CacheInvalidArgumentException;
+use Throwable;
 
 class Generic implements Store
 {
@@ -294,7 +295,14 @@ public function fetch(
             $item->isMiss()
         ) {
             $item->lock();
-            $value = $generator($item, $this);
+
+            try {
+                $value = $generator($item, $this);
+            } catch (Throwable $e) {
+                $item->unlock();
+                throw $e;
+            }
+
             $item->set($value);
             $item->save();
         }