Deprecated the entire getEnvParameters() method

javiereguiluz · javiereguiluz · commit 43741286269b · 2017-03-19T12:50:47.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -563,7 +563,7 @@ protected function getKernelParameters()
                 'kernel.charset' => $this->getCharset(),
                 'kernel.container_class' => $this->getContainerClass(),
             ),
-            $this->getEnvParameters()
+            $this->getEnvParameters(false)
         );
     }
 
@@ -573,13 +573,19 @@ protected function getKernelParameters()
      * Only the parameters starting with "SYMFONY__" are considered.
      *
      * @return array An array of parameters
+     *
+     * @deprecated since version 3.3, to be removed in 4.0
      */
     protected function getEnvParameters()
     {
+        if (0 === func_num_args() || func_get_arg(0)) {
+            @trigger_error(sprintf('The %s() method is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax to get the value of any environment variable from configuration files instead.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         $parameters = array();
         foreach ($_SERVER as $key => $value) {
             if (0 === strpos($key, 'SYMFONY__')) {
-                @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %env()% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);
                 $parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -744,6 +744,7 @@ public function testKernelRootDirNameStartingWithANumber()
 
     /**
      * @group legacy
+     * @expectedDeprecation The Symfony\Component\HttpKernel\Kernel::getEnvParameters() method is deprecated as of 3.3 and will be removed in 4.0. Use the %s syntax to get the value of any environment variable from configuration files instead.
      * @expectedDeprecation The support of special environment variables that start with SYMFONY__ (such as "SYMFONY__FOO__BAR") is deprecated as of 3.3 and will be removed in 4.0. Use the %env()% syntax instead to get the value of environment variables in configuration files.
      */
     public function testSymfonyEnvironmentVariables()

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ protected function getKernelParameters()`
`563`	`563`	`'kernel.charset' => $this->getCharset(),`
`564`	`564`	`'kernel.container_class' => $this->getContainerClass(),`
`565`	`565`	`),`
`566`		`- $this->getEnvParameters()`
	`566`	`+ $this->getEnvParameters(false)`
`567`	`567`	`);`
`568`	`568`	`}`
`569`	`569`
`@@ -573,13 +573,19 @@ protected function getKernelParameters()`
`573`	`573`	`* Only the parameters starting with "SYMFONY__" are considered.`
`574`	`574`	`*`
`575`	`575`	`* @return array An array of parameters`
	`576`	`+ *`
	`577`	`+ * @deprecated since version 3.3, to be removed in 4.0`
`576`	`578`	`*/`
`577`	`579`	`protected function getEnvParameters()`
`578`	`580`	`{`
	`581`	`+ if (0 === func_num_args() \|\| func_get_arg(0)) {`
	`582`	`+ @trigger_error(sprintf('The %s() method is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax to get the value of any environment variable from configuration files instead.', __METHOD__), E_USER_DEPRECATED);`
	`583`	`+ }`
	`584`	`+`
`579`	`585`	`$parameters = array();`
`580`	`586`	`foreach ($_SERVER as $key => $value) {`
`581`	`587`	`if (0 === strpos($key, 'SYMFONY__')) {`
`582`		`- @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %env()% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);`
	`588`	`+ @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);`
`583`	`589`	`$parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;`
`584`	`590`	`}`
`585`	`591`	`}`