diff --git a/src/Symfony/Component/Lock/CHANGELOG.md b/src/Symfony/Component/Lock/CHANGELOG.md index e0e6997033a1..5eb3a7a75382 100644 --- a/src/Symfony/Component/Lock/CHANGELOG.md +++ b/src/Symfony/Component/Lock/CHANGELOG.md @@ -6,6 +6,7 @@ CHANGELOG * `Factory` has been removed, use `LockFactory` instead. * `StoreInterface` has been removed, use `BlockingStoreInterface` and `PersistingStoreInterface` instead. +* removed the `waitAndSave()` method from `CombinedStore`, `MemcachedStore`, `RedisStore`, and `ZookeeperStore` 4.4.0 ----- diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php index 49d40566a485..f77054b37654 100644 --- a/src/Symfony/Component/Lock/Store/CombinedStore.php +++ b/src/Symfony/Component/Lock/Store/CombinedStore.php @@ -16,7 +16,6 @@ use Psr\Log\NullLogger; use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; -use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; use Symfony\Component\Lock\Strategy\StrategyInterface; @@ -92,17 +91,6 @@ public function save(Key $key) throw new LockConflictedException(); } - /** - * {@inheritdoc} - * - * @deprecated since Symfony 4.4. - */ - public function waitAndSave(Key $key) - { - @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))); - } - /** * {@inheritdoc} */ diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index d16ca154509e..2cedb7e27687 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -69,17 +69,6 @@ public function save(Key $key) $this->checkNotExpired($key); } - /** - * {@inheritdoc} - * - * @deprecated since Symfony 4.4. - */ - public function waitAndSave(Key $key) - { - @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))); - } - /** * {@inheritdoc} */ diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index c1aecbfcd2dc..5a3f19ff691e 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -72,17 +72,6 @@ public function save(Key $key) $this->checkNotExpired($key); } - /** - * {@inheritdoc} - * - * @deprecated since Symfony 4.4. - */ - public function waitAndSave(Key $key) - { - @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))); - } - /** * {@inheritdoc} */ diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php index 681416c905af..dd1a1574474d 100644 --- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php +++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php @@ -14,7 +14,6 @@ use Symfony\Component\Lock\Exception\LockAcquiringException; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Exception\LockReleasingException; -use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; @@ -82,17 +81,6 @@ public function exists(Key $key): bool } } - /** - * {@inheritdoc} - * - * @deprecated since Symfony 4.4. - */ - public function waitAndSave(Key $key) - { - @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(); - } - /** * {@inheritdoc} */