bug #33033 [Lock] consistently throw NotSupportException (xabbuh)

nicolas-grekas · nicolas-grekas · commit 854f5d1dee65 · 2019-08-08T09:53:42.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Lock] consistently throw NotSupportException | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 12b8c94 consistently throw NotSupportException
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -94,7 +94,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        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/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -13,6 +13,7 @@
 
 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\StoreInterface;
 
@@ -70,7 +71,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        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/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Cache\Traits\RedisProxy;
 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\StoreInterface;
 
@@ -72,7 +73,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        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)));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function save(Key $key)`
`94`	`94`
`95`	`95`	`public function waitAndSave(Key $key)`
`96`	`96`	`{`
`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)));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Lock\Exception\InvalidArgumentException;`
`15`	`15`	`use Symfony\Component\Lock\Exception\LockConflictedException;`
	`16`	`+use Symfony\Component\Lock\Exception\NotSupportedException;`
`16`	`17`	`use Symfony\Component\Lock\Key;`
`17`	`18`	`use Symfony\Component\Lock\StoreInterface;`
`18`	`19`
`@@ -70,7 +71,7 @@ public function save(Key $key)`
`70`	`71`
`71`	`72`	`public function waitAndSave(Key $key)`
`72`	`73`	`{`
`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)));`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\Cache\Traits\RedisProxy;`
`15`	`15`	`use Symfony\Component\Lock\Exception\InvalidArgumentException;`
`16`	`16`	`use Symfony\Component\Lock\Exception\LockConflictedException;`
	`17`	`+use Symfony\Component\Lock\Exception\NotSupportedException;`
`17`	`18`	`use Symfony\Component\Lock\Key;`
`18`	`19`	`use Symfony\Component\Lock\StoreInterface;`
`19`	`20`
`@@ -72,7 +73,7 @@ public function save(Key $key)`
`72`	`73`
`73`	`74`	`public function waitAndSave(Key $key)`
`74`	`75`	`{`
`75`		`- throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
	`76`	`+ throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', \get_class($this)));`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`/**`