remove supports methods

Simperfit · Simperfit · commit b77e770e61e5 · 2019-07-17T13:09:53.000+02:00
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -99,7 +99,7 @@ Lock
 ----
 
  * Deprecated `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
-   `Symfony\Component\Lock\PersistStoreInterface`.
+   `Symfony\Component\Lock\PersistingStoreInterface`.
  * `Factory` is deprecated, use `LockFactory` instead
 
 Messenger
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -306,7 +306,7 @@ Lock
 ----
 
  * Removed `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
-   `Symfony\Component\Lock\PersistStoreInterface`.
+   `Symfony\Component\Lock\PersistingStoreInterface`.
  * Removed `Factory`, use `LockFactory` instead
 
 Messenger
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1606,7 +1606,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
                             $container->setDefinition($connectionDefinitionId, $connectionDefinition);
                         }
 
-                        $storeDefinition = new Definition(PersistStoreInterface::class);
+                        $storeDefinition = new Definition(PersistingStoreInterface::class);
                         $storeDefinition->setPublic(false);
                         $storeDefinition->setFactory([StoreFactory::class, 'createStore']);
                         $storeDefinition->setArguments([new Reference($connectionDefinitionId)]);
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
@@ -96,11 +96,11 @@ public function save(Key $key)
     /**
      * {@inheritdoc}
      *
-     * @deprecated since Symfony 4.4 and will be removed in 5.0.
+     * @deprecated since Symfony 4.4.
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
         throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
@@ -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/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -72,11 +72,11 @@ public function save(Key $key)
     /**
      * {@inheritdoc}
      *
-     * @deprecated since Symfony 4.4 and will be removed in 5.0.
+     * @deprecated since Symfony 4.4.
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__));
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
         throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -75,11 +75,11 @@ public function save(Key $key)
     /**
      * {@inheritdoc}
      *
-     * @deprecated since Symfony 4.4 and will be removed in 5.0.
+     * @deprecated since Symfony 4.4.
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
         throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
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/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -85,11 +85,11 @@ public function exists(Key $key): bool
     /**
      * {@inheritdoc}
      *
-     * @deprecated since Symfony 4.4 and will be removed in 5.0.
+     * @deprecated since Symfony 4.4.
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
         throw new NotSupportedException();
     }
 
diff --git a/src/Symfony/Component/Lock/StoreInterface.php b/src/Symfony/Component/Lock/StoreInterface.php
@@ -19,7 +19,7 @@
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
- * @deprecated "Symfony\Component\Lock\StoreInterface" is deprecated since Symfony 4.4 and has been split into "Symfony\Component\Lock\PersistingStoreInterface", "Symfony\Component\Lock\BlockingStoreInterface".'
+ * @deprecated since Symfony 4.4, use PersistingStoreInterface and BlockingStoreInterface instead
  */
 interface StoreInterface extends PersistingStoreInterface
 {
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -99,10 +99,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())
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTest.php
@@ -14,15 +14,15 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
-use Symfony\Component\Lock\PersistStoreInterface;
+use Symfony\Component\Lock\PersistingStoreInterface;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 abstract class AbstractStoreTest extends TestCase
 {
     /**
-     * @return PersistStoreInterface
+     * @return PersistingStoreInterface
      */
     abstract protected function getStore();
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
@@ -14,7 +14,7 @@
 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\PersistingStoreInterface;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
@@ -24,7 +24,7 @@ trait BlockingStoreTestTrait
     /**
      * @see AbstractStoreTest::getStore()
      *
-     * @return PersistStoreInterface
+     * @return PersistingStoreInterface
      */
     abstract protected function getStore();
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -267,8 +267,8 @@ public function testputOffExpirationAbortWhenStrategyCantBeMet()
 
     public function testPutOffExpirationIgnoreNonExpiringStorage()
     {
-        $store1 = $this->getMockBuilder(PersistStoreInterface::class)->getMock();
-        $store2 = $this->getMockBuilder(PersistStoreInterface::class)->getMock();
+        $store1 = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
+        $store2 = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
 
         $store = new CombinedStore([$store1, $store2], $this->strategy);
 

Original file line number	Diff line number	Diff line change
`@@ -1606,7 +1606,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont`
`1606`	`1606`	`$container->setDefinition($connectionDefinitionId, $connectionDefinition);`
`1607`	`1607`	`}`
`1608`	`1608`
`1609`		`- $storeDefinition = new Definition(PersistStoreInterface::class);`
	`1609`	`+ $storeDefinition = new Definition(PersistingStoreInterface::class);`
`1610`	`1610`	`$storeDefinition->setPublic(false);`
`1611`	`1611`	`$storeDefinition->setFactory([StoreFactory::class, 'createStore']);`
`1612`	`1612`	`$storeDefinition->setArguments([new Reference($connectionDefinitionId)]);`
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
`@@ -96,11 +96,11 @@ public function save(Key $key)`
`96`	`96`	`/**`
`97`	`97`	`* {@inheritdoc}`
`98`	`98`	`*`
`99`		`- * @deprecated since Symfony 4.4 and will be removed in 5.0.`
	`99`	`+ * @deprecated since Symfony 4.4.`
`100`	`100`	`*/`
`101`	`101`	`public function waitAndSave(Key $key)`
`102`	`102`	`{`
`103`		`- @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`103`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`104`	`104`	`throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`105`	`105`	`}`
`106`	`106`
`@@ -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
`@@ -72,11 +72,11 @@ public function save(Key $key)`
`72`	`72`	`/**`
`73`	`73`	`* {@inheritdoc}`
`74`	`74`	`*`
`75`		`- * @deprecated since Symfony 4.4 and will be removed in 5.0.`
	`75`	`+ * @deprecated since Symfony 4.4.`
`76`	`76`	`*/`
`77`	`77`	`public function waitAndSave(Key $key)`
`78`	`78`	`{`
`79`		`- @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__));`
	`79`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`80`	`80`	`throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ public function save(Key $key)`
`75`	`75`	`/**`
`76`	`76`	`* {@inheritdoc}`
`77`	`77`	`*`
`78`		`- * @deprecated since Symfony 4.4 and will be removed in 5.0.`
	`78`	`+ * @deprecated since Symfony 4.4.`
`79`	`79`	`*/`
`80`	`80`	`public function waitAndSave(Key $key)`
`81`	`81`	`{`
`82`		`- @trigger_error(sprintf('%s() has been deprecated since Symfony 4.4 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`82`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`83`	`83`	`throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`84`	`84`	`}`
`85`	`85`
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`	`}`