remove supports methods

Simperfit · Simperfit · commit 40159e251d55 · 2019-07-12T09:20:21.000+02:00
diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
@@ -24,9 +24,4 @@ interface BlockingStoreInterface
      * @throws LockConflictedException
      */
     public function waitAndSave(Key $key);
-
-    /**
-     * Checks if the store can wait until a key becomes free before storing the resource.
-     */
-    public function supportsWaitAndSave(): bool;
 }
diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
@@ -71,7 +71,7 @@ public function acquire($blocking = false)
     {
         try {
             if ($blocking) {
-                if (!$this->store instanceof StoreInterface && !($this->store instanceof BlockingStoreInterface && $this->store->supportsWaitAndSave())) {
+                if (!$this->store instanceof StoreInterface && !($this->store instanceof BlockingStoreInterface)) {
                     throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this->store)));
                 }
                 $this->store->waitAndSave($this->key);
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -188,12 +188,4 @@ public function exists(Key $key)
 
         return false;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsWaitAndSave(): bool
-    {
-        return false;
-    }
 }
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -65,14 +65,6 @@ public function waitAndSave(Key $key)
         $this->lock($key, true);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsWaitAndSave(): bool
-    {
-        return true;
-    }
-
     private function lock(Key $key, $blocking)
     {
         // The lock is maybe already acquired.
diff --git a/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php b/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
@@ -101,12 +101,4 @@ public function exists(Key $key)
     {
         return $this->decorated->exists($key);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsWaitAndSave(): bool
-    {
-        return true;
-    }
 }
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -113,12 +113,4 @@ public function exists(Key $key)
     {
         return $key->hasState(__CLASS__);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsWaitAndSave(): bool
-    {
-        return true;
-    }
 }
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -100,10 +100,6 @@ public function testAcquireBlocking()
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder([PersistingStoreInterface::class, BlockingStoreInterface::class])->getMock();
         $lock = new Lock($key, $store);
-        $store
-            ->expects($this->once())
-            ->method('supportsWaitAndSave')
-            ->willReturn(true);
 
         $store
             ->expects($this->never())

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function acquire($blocking = false)`
`71`	`71`	`{`
`72`	`72`	`try {`
`73`	`73`	`if ($blocking) {`
`74`		`- if (!$this->store instanceof StoreInterface && !($this->store instanceof BlockingStoreInterface && $this->store->supportsWaitAndSave())) {`
	`74`	`+ if (!$this->store instanceof StoreInterface && !($this->store instanceof BlockingStoreInterface)) {`
`75`	`75`	`throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this->store)));`
`76`	`76`	`}`
`77`	`77`	`$this->store->waitAndSave($this->key);`
Original file line number	Diff line number	Diff line change
`@@ -188,12 +188,4 @@ public function exists(Key $key)`
`188`	`188`
`189`	`189`	`return false;`
`190`	`190`	`}`
`191`		`-`
`192`		`- /**`
`193`		`- * {@inheritdoc}`
`194`		`- */`
`195`		`- public function supportsWaitAndSave(): bool`
`196`		`- {`
`197`		`- return false;`
`198`		`- }`
`199`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,6 @@ public function waitAndSave(Key $key)`
`65`	`65`	`$this->lock($key, true);`
`66`	`66`	`}`
`67`	`67`
`68`		`- /**`
`69`		`- * {@inheritdoc}`
`70`		`- */`
`71`		`- public function supportsWaitAndSave(): bool`
`72`		`- {`
`73`		`- return true;`
`74`		`- }`
`75`		`-`
`76`	`68`	`private function lock(Key $key, $blocking)`
`77`	`69`	`{`
`78`	`70`	`// The lock is maybe already acquired.`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,4 @@ public function exists(Key $key)`
`101`	`101`	`{`
`102`	`102`	`return $this->decorated->exists($key);`
`103`	`103`	`}`
`104`		`-`
`105`		`- /**`
`106`		`- * {@inheritdoc}`
`107`		`- */`
`108`		`- public function supportsWaitAndSave(): bool`
`109`		`- {`
`110`		`- return true;`
`111`		`- }`
`112`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,4 @@ public function exists(Key $key)`
`113`	`113`	`{`
`114`	`114`	`return $key->hasState(__CLASS__);`
`115`	`115`	`}`
`116`		`-`
`117`		`- /**`
`118`		`- * {@inheritdoc}`
`119`		`- */`
`120`		`- public function supportsWaitAndSave(): bool`
`121`		`- {`
`122`		`- return true;`
`123`		`- }`
`124`	`116`	`}`