diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php index 4af7770b2b..f2a2c4dc57 100644 --- a/src/Symfony/Component/Lock/Store/CombinedStore.php +++ b/src/Symfony/Component/Lock/Store/CombinedStore.php @@ -27,7 +27,7 @@ use Symfony\Component\Lock\Strategy\StrategyInterface; * * @author Jérémy Derussé */ -class CombinedStore implements StoreInterface, PersistStoreInterface, LoggerAwareInterface +class CombinedStore implements StoreInterface, LoggerAwareInterface { use LoggerAwareTrait; use ExpiringStoreTrait; diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php index e5b2b4c5c3..64721a300a 100644 --- a/src/Symfony/Component/Lock/Store/FlockStore.php +++ b/src/Symfony/Component/Lock/Store/FlockStore.php @@ -16,7 +16,6 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Exception\LockStorageException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -29,7 +28,7 @@ use Symfony\Component\Lock\StoreInterface; * @author Romain Neutron * @author Nicolas Grekas */ -class FlockStore implements StoreInterface, BlockingStoreInterface, PersistStoreInterface +class FlockStore implements StoreInterface, BlockingStoreInterface { private $lockPath; diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index 30673c4355..67b7d8eefb 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -15,7 +15,6 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -23,7 +22,7 @@ use Symfony\Component\Lock\StoreInterface; * * @author Jérémy Derussé */ -class MemcachedStore implements StoreInterface, PersistStoreInterface +class MemcachedStore implements StoreInterface { use ExpiringStoreTrait; diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php index 3e5d7b35b0..70e041f292 100644 --- a/src/Symfony/Component/Lock/Store/PdoStore.php +++ b/src/Symfony/Component/Lock/Store/PdoStore.php @@ -19,7 +19,6 @@ use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -35,7 +34,7 @@ use Symfony\Component\Lock\StoreInterface; * * @author Jérémy Derussé */ -class PdoStore implements StoreInterface, PersistStoreInterface +class PdoStore implements StoreInterface { use ExpiringStoreTrait; diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index e3f4675724..c0ae6ea9b3 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -17,7 +17,6 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -25,7 +24,7 @@ use Symfony\Component\Lock\StoreInterface; * * @author Jérémy Derussé */ -class RedisStore implements StoreInterface, PersistStoreInterface +class RedisStore implements StoreInterface { use ExpiringStoreTrait; diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php index 32f49f637c..293a3a7e6a 100644 --- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php +++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php @@ -15,7 +15,6 @@ use Symfony\Component\Lock\BlockingStoreInterface; use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -23,7 +22,7 @@ use Symfony\Component\Lock\StoreInterface; * * @author Jérémy Derussé */ -class SemaphoreStore implements StoreInterface, PersistStoreInterface, BlockingStoreInterface +class SemaphoreStore implements StoreInterface, BlockingStoreInterface { /** * Returns whether or not the store is supported. diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php index 8ea91e76db..0de0a372f7 100644 --- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php +++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php @@ -16,7 +16,6 @@ use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Exception\LockReleasingException; use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\StoreInterface; /** @@ -24,7 +23,7 @@ use Symfony\Component\Lock\StoreInterface; * * @author Ganesh Chandrasekaran */ -class ZookeeperStore implements StoreInterface, PersistStoreInterface +class ZookeeperStore implements StoreInterface { use ExpiringStoreTrait; diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php index e8eae7f310..9c38f97ece 100644 --- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php @@ -17,6 +17,7 @@ use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistStoreInterface; use Symfony\Component\Lock\Store\CombinedStore; use Symfony\Component\Lock\Store\RedisStore; +use Symfony\Component\Lock\StoreInterface; use Symfony\Component\Lock\Strategy\StrategyInterface; use Symfony\Component\Lock\Strategy\UnanimousStrategy; @@ -267,8 +268,8 @@ class CombinedStoreTest extends AbstractStoreTest public function testPutOffExpirationIgnoreNonExpiringStorage() { - $store1 = $this->getMockBuilder([PersistStoreInterface::class, BlockingStoreInterface::class])->getMock(); - $store2 = $this->getMockBuilder([PersistStoreInterface::class, BlockingStoreInterface::class])->getMock(); + $store1 = $this->getMockBuilder(StoreInterface::class)->getMock(); + $store2 = $this->getMockBuilder(StoreInterface::class)->getMock(); $store = new CombinedStore([$store1, $store2], $this->strategy);