fix some deprecations

xabbuh · xabbuh · commit aea214450016 · 2019-07-13T18:25:19.000+02:00
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -71,6 +71,7 @@ Form
 FrameworkBundle
 ---------------
 
+ * Deprecated booting the kernel before running `WebTestCase::createClient()`.
  * Deprecated support for `templating` engine in `TemplateController`, use Twig instead
  * The `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
    has been deprecated.
@@ -92,6 +93,12 @@ HttpKernel
 
  * The `DebugHandlersListener` class has been marked as `final`
 
+Lock
+----
+
+ * Deprecated `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
+   `Symfony\Component\Lock\PersistStoreInterface`.
+
 Messenger
 ---------
 
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -208,6 +208,8 @@ Form
 FrameworkBundle
 ---------------
 
+ * Dropped support for booting the kernel before running `WebTestCase::createClient()`. `createClient()` will throw an
+   exception if the kernel was already booted before.
  * Removed the `framework.templating` option, use Twig instead.
  * The project dir argument of the constructor of `AssetsInstallCommand` is required.
  * Removed support for `bundle:controller:action` syntax to reference controllers. Use `serviceOrFqcn::method`
@@ -299,6 +301,12 @@ Intl
  * Removed `Intl::getLocaleBundle()`, use `Locales` instead
  * Removed `Intl::getRegionBundle()`, use `Countries` instead
 
+Lock
+----
+
+ * Removed `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
+   `Symfony\Component\Lock\PersistStoreInterface`.
+
 Messenger
 ---------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -40,7 +40,7 @@ protected function doTearDown(): void
     protected static function createClient(array $options = [], array $server = [])
     {
         if (true === static::$booted) {
-            @trigger_error(sprintf('Booting the kernel before calling %s::%s is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Booting the kernel before calling %s() is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.', __METHOD__), E_USER_DEPRECATED);
         }
 
         $kernel = static::bootKernel($options);
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -98,7 +98,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);
+        @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)));
     }
 
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -74,7 +74,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));
         throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -145,7 +145,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));
         throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', __METHOD__));
     }
 
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -77,7 +77,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);
+        @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)));
     }
 
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -87,7 +87,7 @@ public function exists(Key $key): bool
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);
+        @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();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected function doTearDown(): void`
`40`	`40`	`protected static function createClient(array $options = [], array $server = [])`
`41`	`41`	`{`
`42`	`42`	`if (true === static::$booted) {`
`43`		`- @trigger_error(sprintf('Booting the kernel before calling %s::%s is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.', __CLASS__, __METHOD__), E_USER_DEPRECATED);`
	`43`	`+ @trigger_error(sprintf('Booting the kernel before calling %s() is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.', __METHOD__), E_USER_DEPRECATED);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$kernel = static::bootKernel($options);`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function save(Key $key)`
`98`	`98`	`*/`
`99`	`99`	`public function waitAndSave(Key $key)`
`100`	`100`	`{`
`101`		`- @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);`
	`101`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`102`	`102`	`throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function save(Key $key)`
`74`	`74`	`*/`
`75`	`75`	`public function waitAndSave(Key $key)`
`76`	`76`	`{`
`77`		`- @trigger_error(sprintf('%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));`
	`77`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));`
`78`	`78`	`throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function save(Key $key)`
`145`	`145`	`*/`
`146`	`146`	`public function waitAndSave(Key $key)`
`147`	`147`	`{`
`148`		`- @trigger_error(sprintf('%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));`
	`148`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__));`
`149`	`149`	`throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', __METHOD__));`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function save(Key $key)`
`77`	`77`	`*/`
`78`	`78`	`public function waitAndSave(Key $key)`
`79`	`79`	`{`
`80`		`- @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);`
	`80`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`81`	`81`	`throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function exists(Key $key): bool`
`87`	`87`	`*/`
`88`	`88`	`public function waitAndSave(Key $key)`
`89`	`89`	`{`
`90`		`- @trigger_error(sprintf('%s::%s has been deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', \get_class($this), __METHOD__), E_USER_DEPRECATED);`
	`90`	`+ @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);`
`91`	`91`	`throw new NotSupportedException();`
`92`	`92`	`}`
`93`	`93`