From eaad40e5007bb440d9f2206b482c4d8bac41b25f Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 29 Jul 2019 21:21:39 +0200
Subject: [PATCH] let BlockingStoreInterface extend PersistingStoreInterface

---
 src/Symfony/Component/Lock/BlockingStoreInterface.php       | 2 +-
 src/Symfony/Component/Lock/Store/RetryTillSaveStore.php     | 2 +-
 src/Symfony/Component/Lock/Tests/LockTest.php               | 6 +++---
 .../Component/Lock/Tests/Store/CombinedStoreTest.php        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
index 162c9b3d411a0..15efaa2bdf6fa 100644
--- 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
index 81185f59eb2a5..9a412810c2489 100644
--- 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
index 87331a64cf612..1239ddba0fd30 100644
--- 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
index 0f77d103d5599..15ceb42bb5db1 100644
--- 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);
     }