Skip to content

Commit 03064dd

Browse files
Merge branch '3.4' into 4.3
* 3.4: consistently throw NotSupportException [HttpKernel] Clarify error handler restoring process again [Intl] fix nullable phpdocs and useless method visibility of internal class Resilience against file_get_contents() race conditions.
2 parents 34827f2 + 83a4262 commit 03064dd

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Store/CombinedStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function save(Key $key)
9494

9595
public function waitAndSave(Key $key)
9696
{
97-
throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
97+
throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
9898
}
9999

100100
/**

Store/MemcachedStore.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Lock\Exception\InvalidArgumentException;
1515
use Symfony\Component\Lock\Exception\LockConflictedException;
16+
use Symfony\Component\Lock\Exception\NotSupportedException;
1617
use Symfony\Component\Lock\Key;
1718
use Symfony\Component\Lock\StoreInterface;
1819

@@ -70,7 +71,7 @@ public function save(Key $key)
7071

7172
public function waitAndSave(Key $key)
7273
{
73-
throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
74+
throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
7475
}
7576

7677
/**

Store/RedisStore.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\Cache\Traits\RedisProxy;
1616
use Symfony\Component\Lock\Exception\InvalidArgumentException;
1717
use Symfony\Component\Lock\Exception\LockConflictedException;
18+
use Symfony\Component\Lock\Exception\NotSupportedException;
1819
use Symfony\Component\Lock\Key;
1920
use Symfony\Component\Lock\StoreInterface;
2021

@@ -76,7 +77,7 @@ public function save(Key $key)
7677
*/
7778
public function waitAndSave(Key $key)
7879
{
79-
throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
80+
throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
8081
}
8182

8283
/**

0 commit comments

Comments
 (0)