Skip to content

Commit

Permalink
minor #33029 [Lock] remove deprecated waitAndSave() methods (xabbuh)
Browse files Browse the repository at this point in the history
This PR was merged into the 5.0-dev branch.

Discussion
----------

[Lock] remove deprecated waitAndSave() methods

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | missed in #32555
| License       | MIT
| Doc PR        |

Commits
-------

fa18765 remove deprecated waitAndSave() methods
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents 83dc835 + fa18765 commit 0776b3a
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 46 deletions.
1 change: 1 addition & 0 deletions src/Symfony/Component/Lock/CHANGELOG.md
Expand Up @@ -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
-----
Expand Down
12 changes: 0 additions & 12 deletions src/Symfony/Component/Lock/Store/CombinedStore.php
Expand Up @@ -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;
Expand Down Expand Up @@ -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}
*/
Expand Down
11 changes: 0 additions & 11 deletions src/Symfony/Component/Lock/Store/MemcachedStore.php
Expand Up @@ -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}
*/
Expand Down
11 changes: 0 additions & 11 deletions src/Symfony/Component/Lock/Store/RedisStore.php
Expand Up @@ -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}
*/
Expand Down
12 changes: 0 additions & 12 deletions src/Symfony/Component/Lock/Store/ZookeeperStore.php
Expand Up @@ -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;

Expand Down Expand Up @@ -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}
*/
Expand Down

0 comments on commit 0776b3a

Please sign in to comment.