feature #38193 Make RetryTillSaveStore implements the SharedLockStoreInterface (jderusse)

fabpot · fabpot · commit 128bbd11eb57 · 2020-09-16T14:38:44.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- Make RetryTillSaveStore implements the SharedLockStoreInterface | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | / | License | MIT | Doc PR | / The `RetryTillSaveStore` decorates a non blocking store (ie. `RedisStore`) to make it blockable. The issue is: if the decorate store manage SharedLock, the Decorator does not implements this interface. It's currently not possible to get both `blocking` and `sharable` store. Commits ------- a0321e6 Make RetryTillSaveStore implements the SharedLockStoreInterface
diff --git a/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php b/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
@@ -16,16 +16,18 @@
 use Psr\Log\NullLogger;
 use Symfony\Component\Lock\BlockingStoreInterface;
 use Symfony\Component\Lock\Exception\LockConflictedException;
+use Symfony\Component\Lock\Exception\NotSupportedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
+use Symfony\Component\Lock\SharedLockStoreInterface;
 
 /**
  * RetryTillSaveStore is a PersistingStoreInterface implementation which decorate a non blocking PersistingStoreInterface to provide a
  * blocking storage.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class RetryTillSaveStore implements BlockingStoreInterface, LoggerAwareInterface
+class RetryTillSaveStore implements BlockingStoreInterface, SharedLockStoreInterface, LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
@@ -76,6 +78,24 @@ public function waitAndSave(Key $key)
         throw new LockConflictedException();
     }
 
+    public function saveRead(Key $key)
+    {
+        if (!$this->decorated instanceof SharedLockStoreInterface) {
+            throw new NotSupportedException(sprintf('The "%s" store must decorate a "%s" store.', get_debug_type($this), ShareLockStoreInterface::class));
+        }
+
+        $this->decorated->saveRead($key);
+    }
+
+    public function waitAndSaveRead(Key $key)
+    {
+        if (!$this->decorated instanceof SharedLockStoreInterface) {
+            throw new NotSupportedException(sprintf('The "%s" store must decorate a "%s" store.', get_debug_type($this), ShareLockStoreInterface::class));
+        }
+
+        $this->decorated->waitAndSaveRead($key);
+    }
+
     /**
      * {@inheritdoc}
      */
