Revert "[WebServerBundle] Deprecate relying on --env in server:start and server:run"

Robin Chalas · Robin Chalas · commit 3ad8da9bcae9 · 2018-11-07T18:17:26.000+01:00
This reverts commit 31b5615.
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -359,9 +359,3 @@ Validator
  * Using the `Bic`, `Country`, `Currency`, `Language` and `Locale` constraints without `symfony/intl` is deprecated
  * Using the `Email` constraint in strict mode without `egulias/email-validator` is deprecated
  * Using the `Expression` constraint without `symfony/expression-language` is deprecated
-
-WebServerBundle
----------------
-
-* Omitting the `$environment` argument of the `ServerRunCommand` and 
-  `ServerStartCommand` constructors is deprecated.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -282,9 +282,3 @@ Workflow
  * `add` method has been removed use `addWorkflow` method in `Workflow\Registry` instead.
  * `SupportStrategyInterface` has been removed, use `WorkflowSupportStrategyInterface` instead.
  * `ClassInstanceSupportStrategy` has been removed, use `InstanceOfSupportStrategy` instead.
-
-WebServerBundle
----------------
-
-* Omitting the `$environment` argument of  the `ServerRunCommand` and
-  `ServerStartCommand` constructors now throws a `\TypeError`.
diff --git a/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
@@ -4,8 +4,6 @@ CHANGELOG
 4.2.0
 -----
 
-* Deprecated omitting the `$environment` argument of the `ServerRunCommand` and
- `ServerStartCommand` constructors
  * Added ability to display the current hostname address if available when binding to 0.0.0.0
 
 3.4.0
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
@@ -36,10 +36,6 @@ class ServerRunCommand extends Command
 
     public function __construct(string $documentRoot = null, string $environment = null)
     {
-        if (!$environment) {
-            @trigger_error(sprintf('Omitting the $environment argument of the "%s" constructor is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
-        }
-
         $this->documentRoot = $documentRoot;
         $this->environment = $environment;
 
@@ -103,7 +99,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $documentRoot = $this->documentRoot;
         }
 
-        // @deprecated since Symfony 4.2
         if (!$env = $this->environment) {
             if ($input->hasOption('env') && !$env = $input->getOption('env')) {
                 $io->error('The environment must be either passed as second argument of the constructor or through the "--env" input option.');
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
@@ -36,10 +36,6 @@ class ServerStartCommand extends Command
 
     public function __construct(string $documentRoot = null, string $environment = null)
     {
-        if (!$environment) {
-            @trigger_error(sprintf('Omitting the $environment argument of the "%s" constructor is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
-        }
-
         $this->documentRoot = $documentRoot;
         $this->environment = $environment;
 
@@ -116,7 +112,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $documentRoot = $this->documentRoot;
         }
 
-        // @deprecated since Symfony 4.2
         if (!$env = $this->environment) {
             if ($input->hasOption('env') && !$env = $input->getOption('env')) {
                 $io->error('The environment must be either passed as second argument of the constructor or through the "--env" input option.');
