Merge branch '4.3' into 4.4

* 4.3: consistently throw NotSupportException [HttpKernel] Clarify error handler restoring process again [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt [Intl] fix nullable phpdocs and useless method visibility of internal class Resilience against file_get_contents() race conditions.
symfony · Aug 8, 2019 · 317b86f · 317b86f
2 parents 3280c34 + 03064dd
commit 317b86f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Store/CombinedStore.php b/Store/CombinedStore.php
@@ -101,7 +101,7 @@ public function save(Key $key)
     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)));
+        throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
     }
 
     /**

diff --git a/Store/MemcachedStore.php b/Store/MemcachedStore.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
+use Symfony\Component\Lock\Exception\NotSupportedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\StoreInterface;
 
@@ -77,7 +78,7 @@ public function save(Key $key)
     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)));
+        throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
     }
 
     /**

diff --git a/Store/RedisStore.php b/Store/RedisStore.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
+use Symfony\Component\Lock\Exception\NotSupportedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\StoreInterface;
 
@@ -80,7 +81,7 @@ public function save(Key $key)
     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)));
+        throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));
     }
 
     /**