diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2' into 4.3

Browse Source 
* 4.2:
  [Lock] fix bad merge
This commit is contained in:
Nicolas Grekas 2019-06-17 20:45:40 +02:00
commit 1337dbff81
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Lock/Store/PdoStore.php
View File

@ -16,7 +16,6 @@ use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\InvalidArgumentException;
use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Exception\LockConflictedException;
use Symfony\Component\Lock\Exception\LockExpiredException;
use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Exception\NotSupportedException;
use Symfony\Component\Lock\Key; use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\StoreInterface; use Symfony\Component\Lock\StoreInterface;
@ -36,6 +35,8 @@ use Symfony\Component\Lock\StoreInterface;
*/ */
class PdoStore implements StoreInterface class PdoStore implements StoreInterface
{ {
use ExpiringStoreTrait;
private $conn; private $conn;
private $dsn; private $dsn;
private $driver; private $driver;
@ -123,9 +124,7 @@ class PdoStore implements StoreInterface
try { try {
$stmt->execute(); $stmt->execute();
if ($key->isExpired()) { $this->checkNotExpired($key);
throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key));
}
return; return;
} catch (DBALException $e) { } catch (DBALException $e) {
@ -136,9 +135,7 @@ class PdoStore implements StoreInterface
$this->putOffExpiration($key, $this->initialTtl); $this->putOffExpiration($key, $this->initialTtl);
} }
if ($key->isExpired()) { $this->checkNotExpired($key);
throw new LockExpiredException(sprintf('Failed to store the "%s" lock.', $key));
}
if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) { if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) {
$this->prune(); $this->prune();
@ -178,9 +175,7 @@ class PdoStore implements StoreInterface
throw new LockConflictedException(); throw new LockConflictedException();
} }
if ($key->isExpired()) { $this->checkNotExpired($key);
throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key));
}
} }
/** /**