bug #32803 [Lock] let BlockingStoreInterface extend PersistingStoreInterface (xabbuh)

nicolas-grekas · nicolas-grekas · commit 40fe1610d23a · 2019-07-30T19:33:00.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Lock] let BlockingStoreInterface extend PersistingStoreInterface | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32555 (comment) | License | MIT | Doc PR | Commits ------- eaad40e let BlockingStoreInterface extend PersistingStoreInterface
diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
@@ -16,7 +16,7 @@
 /**
  * @author Hamza Amrouche <hamza.simperfit@gmail.com>
  */
-interface BlockingStoreInterface
+interface BlockingStoreInterface extends PersistingStoreInterface
 {
     /**
      * Waits until a key becomes free, then stores the resource.
diff --git a/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php b/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
@@ -26,7 +26,7 @@
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class RetryTillSaveStore implements PersistingStoreInterface, BlockingStoreInterface, StoreInterface, LoggerAwareInterface
+class RetryTillSaveStore implements BlockingStoreInterface, StoreInterface, LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -97,7 +97,7 @@ public function testAcquireReturnsFalseStoreInterface()
     public function testAcquireBlocking()
     {
         $key = new Key(uniqid(__METHOD__, true));
-        $store = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
+        $store = $this->createMock(BlockingStoreInterface::class);
         $lock = new Lock($key, $store);
 
         $store
@@ -213,7 +213,7 @@ public function testReleaseStoreInterface()
     public function testReleaseOnDestruction()
     {
         $key = new Key(uniqid(__METHOD__, true));
-        $store = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
+        $store = $this->createMock(BlockingStoreInterface::class);
         $lock = new Lock($key, $store, 10);
 
         $store
@@ -232,7 +232,7 @@ public function testReleaseOnDestruction()
     public function testNoAutoReleaseWhenNotConfigured()
     {
         $key = new Key(uniqid(__METHOD__, true));
-        $store = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
+        $store = $this->createMock(BlockingStoreInterface::class);
         $lock = new Lock($key, $store, 10, false);
 
         $store
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -62,8 +62,8 @@ public function getStore()
     protected function setUp()
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
-        $this->store1 = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
-        $this->store2 = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
+        $this->store1 = $this->createMock(BlockingStoreInterface::class);
+        $this->store2 = $this->createMock(BlockingStoreInterface::class);
 
         $this->store = new CombinedStore([$this->store1, $this->store2], $this->strategy);
     }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* @author Hamza Amrouche <[email protected]>`
`18`	`18`	`*/`
`19`		`-interface BlockingStoreInterface`
	`19`	`+interface BlockingStoreInterface extends PersistingStoreInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* Waits until a key becomes free, then stores the resource.`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Jérémy Derussé <[email protected]>`
`28`	`28`	`*/`
`29`		`-class RetryTillSaveStore implements PersistingStoreInterface, BlockingStoreInterface, StoreInterface, LoggerAwareInterface`
	`29`	`+class RetryTillSaveStore implements BlockingStoreInterface, StoreInterface, LoggerAwareInterface`
`30`	`30`	`{`
`31`	`31`	`use LoggerAwareTrait;`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ public function getStore()`
`62`	`62`	`protected function setUp()`
`63`	`63`	`{`
`64`	`64`	`$this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();`
`65`		`- $this->store1 = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();`
`66`		`- $this->store2 = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();`
	`65`	`+ $this->store1 = $this->createMock(BlockingStoreInterface::class);`
	`66`	`+ $this->store2 = $this->createMock(BlockingStoreInterface::class);`
`67`	`67`
`68`	`68`	`$this->store = new CombinedStore([$this->store1, $this->store2], $this->strategy);`
`69`	`69`	`}`