minor #32434 [Lock] Fix tests (Simperfit)

fabpot · fabpot · commit f1dff5e2691d · 2019-07-08T16:37:27.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Lock] Fix tests | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | nno  | Tests pass? | yes  | Fixed tickets |  | License | MIT | Doc PR | none   cc @fabpot fix lock tests. Commits ------- 2c5089b [Lock] Fix tests
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -27,7 +27,7 @@
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-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
@@ -16,7 +16,6 @@
 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 @@
  * @author Romain Neutron <imprec@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-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
@@ -15,15 +15,14 @@
 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;
 
 /**
  * MemcachedStore is a StoreInterface implementation using Memcached as store engine.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-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
@@ -19,7 +19,6 @@
 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 @@
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-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
@@ -17,15 +17,14 @@
 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;
 
 /**
  * RedisStore is a StoreInterface implementation using Redis as store engine.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-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
@@ -15,15 +15,14 @@
 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;
 
 /**
  * SemaphoreStore is a StoreInterface implementation using Semaphore as store engine.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-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
@@ -16,15 +16,14 @@
 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;
 
 /**
  * ZookeeperStore is a StoreInterface implementation using Zookeeper as store engine.
  *
  * @author Ganesh Chandrasekaran <gchandrasekaran@wayfair.com>
  */
-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
@@ -17,6 +17,7 @@
 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 @@ public function testputOffExpirationAbortWhenStrategyCantBeMet()
 
     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);
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Jérémy Derussé <[email protected]>`
`29`	`29`	`*/`
`30`		`-class CombinedStore implements StoreInterface, PersistStoreInterface, LoggerAwareInterface`
	`30`	`+class CombinedStore implements StoreInterface, LoggerAwareInterface`
`31`	`31`	`{`
`32`	`32`	`use LoggerAwareTrait;`
`33`	`33`	`use ExpiringStoreTrait;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`use Symfony\Component\Lock\Exception\LockConflictedException;`
`20`	`20`	`use Symfony\Component\Lock\Exception\NotSupportedException;`
`21`	`21`	`use Symfony\Component\Lock\Key;`
`22`		`-use Symfony\Component\Lock\PersistStoreInterface;`
`23`	`22`	`use Symfony\Component\Lock\StoreInterface;`
`24`	`23`
`25`	`24`	`/**`
`@@ -35,7 +34,7 @@`
`35`	`34`	`*`
`36`	`35`	`* @author Jérémy Derussé <[email protected]>`
`37`	`36`	`*/`
`38`		`-class PdoStore implements StoreInterface, PersistStoreInterface`
	`37`	`+class PdoStore implements StoreInterface`
`39`	`38`	`{`
`40`	`39`	`use ExpiringStoreTrait;`
`41`	`40`