fix some deprecations and add upgrade instructions

symfony · fabpot · Jul 15, 2019 · Jul 13, 2019 · Jul 14, 2019 · fa317f23f53dd737c8a037f8cf367d89a6eb373d
commit fa317f23f53dd737c8a037f8cf367d89a6eb373d
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.
@@ -90,8 +91,16 @@ HttpFoundation
 HttpKernel
 ----------
 
+ * Implementing the `BundleInterface` without implementing the `getPublicDir()` method is deprecated.
+   This method will be added to the interface in 5.0.
  * 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
 ---------
 
@@ -143,3 +152,8 @@ WebProfilerBundle
 
  * Deprecated the `ExceptionController::templateExists()` method
  * Deprecated the `TemplateManager::templateExists()` method
+
+WebServerBundle
+---------------
+
+ * The bundle is deprecated and will be removed in 5.0.
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`
@@ -274,6 +276,7 @@ HttpFoundation
 HttpKernel
 ----------
 
+ * The `getPublicDir()` method has been added to the `BundleInterface`.
  * Removed `Client`, use `HttpKernelBrowser` instead
  * The `Kernel::getRootDir()` and the `kernel.root_dir` parameter have been removed
  * The `KernelInterface::getName()` and the `kernel.name` parameter have been removed
@@ -299,6 +302,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
 ---------
 
@@ -560,3 +569,8 @@ Yaml
 
  * The parser is now stricter and will throw a `ParseException` when a
    mapping is found inside a multi-line string.
+
+WebServerBundle
+---------------
+
+ * The bundle has been removed.
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/Bundle/WebServerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.4.0
+---------------
+
+ * The bundle is deprecated and will be removed in 5.0.
+
 4.2.0
 -----
 

diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
@@ -26,7 +26,7 @@
 /**
  * @author Grégoire Pineau <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class ServerLogCommand extends Command
 {
@@ -80,7 +80,7 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
 
         $filter = $input->getOption('filter');
         if ($filter) {

diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
@@ -27,7 +27,7 @@
  *
  * @author Michał Pipa <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class ServerRunCommand extends Command
 {
@@ -92,7 +92,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
 
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 

diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
@@ -27,7 +27,7 @@
  *
  * @author Christian Flothmann <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class ServerStartCommand extends Command
 {
@@ -92,7 +92,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
 
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 

diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
@@ -26,7 +26,7 @@
  *
  * @author Christian Flothmann <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class ServerStatusCommand extends Command
 {
@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
 
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
         $server = new WebServer($this->pidFileDirectory);

diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
@@ -24,7 +24,7 @@
  *
  * @author Christian Flothmann <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class ServerStopCommand extends Command
 {
@@ -63,7 +63,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
 
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 

diff --git a/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php b/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php
@@ -20,7 +20,7 @@
 /**
  * @author Robin Chalas <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class WebServerExtension extends Extension
 {
@@ -43,7 +43,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('web_server.command.server_log');
         }
 
-        @trigger_error('Using the WebserverBundle is deprecated since 4.3, the new symfony local server has more feature, you should use it instead.');
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4, the new symfony local server has more feature, you should use it instead.', E_USER_DEPRECATED);
     }
 
     private function getPublicDirectory(ContainerBuilder $container)

diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php
@@ -20,7 +20,7 @@
  *
  * @author Fabien Potencier <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class WebServer
 {

diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerBundle.php b/src/Symfony/Bundle/WebServerBundle/WebServerBundle.php
@@ -14,12 +14,12 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class WebServerBundle extends Bundle
 {
     public function boot()
     {
-        @trigger_error('Using the WebserverBundle is deprecated since 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
+        @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
     }
 }
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -14,7 +14,7 @@
 /**
  * @author Fabien Potencier <[email protected]>
  *
- * @deprecated since version 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
+ * @deprecated since Symfony 4.4, to be removed in 5.0; the new Symfony local server has more features, you can use it instead.
  */
 class WebServerConfig
 {

diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,7 +4,9 @@ CHANGELOG
 4.4.0
 -----
 
-* The `DebugHandlersListener` class has been marked as `final`
+ * Implementing the `BundleInterface` without implementing the `getPublicDir()` method is deprecated.
+   This method will be added to the interface in 5.0.
+ * The `DebugHandlersListener` class has been marked as `final`
 
 4.3.0
 -----

@@ -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)));
     }
 

@@ -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)));
     }
 

@@ -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__));
     }
 

@@ -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)));
     }
 

@@ -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();
     }