bug symfony#10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)

fabpot · fabpot · commit 61763452b7d2 · 2014-08-08T17:50:03.000+02:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes symfony#10914). Discussion ---------- [HttpKernel] added an analyze of environment parameters for built-in server | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | symfony#10208 | License | MIT | Doc PR | - With the built-in server, it is not possible to use the external parameters: environment variables are only in `$_ENV`. Commits ------- 696b978 [HttpKernel] added an analyze of environment parameters for built-in server.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/router_dev.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/router_dev.php
@@ -25,6 +25,7 @@
     return false;
 }
 
+$_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';
 
 require 'app_dev.php';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/router_prod.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/router_prod.php
@@ -25,6 +25,7 @@
     return false;
 }
 
+$_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app.php';
 
 require 'app.php';

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`return false;`
`26`	`26`	`}`
`27`	`27`
	`28`	`+$_SERVER = array_merge($_SERVER, $_ENV);`
`28`	`29`	`$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';`
`29`	`30`
`30`	`31`	`require 'app_dev.php';`