[WebServerBundle] fix a bug where require would not require the good file because of env

Amrouche Hamza · Amrouche Hamza · commit 05888ce66210 · 2017-12-16T17:37:44.000+01:00
diff --git a/src/Symfony/Bundle/WebServerBundle/Resources/router.php b/src/Symfony/Bundle/WebServerBundle/Resources/router.php
@@ -32,6 +32,10 @@
 
 $script = getenv('APP_FRONT_CONTROLLER') ?: 'index.php';
 
+if (isset($_ENV['APP_FRONT_CONTROLLER']) && false === getenv('APP_FRONT_CONTROLLER')) {
+    $script = $_ENV['APP_FRONT_CONTROLLER'];
+}
+
 $_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;
 
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -33,6 +33,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null
         }
 
         putenv('APP_FRONT_CONTROLLER='.$file);
+        $_ENV['APP_FRONT_CONTROLLER'] = $file;
 
         $this->documentRoot = $documentRoot;
         $this->env = $env;

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`putenv('APP_FRONT_CONTROLLER='.$file);`
	`36`	`+ $_ENV['APP_FRONT_CONTROLLER'] = $file;`
`36`	`37`
`37`	`38`	`$this->documentRoot = $documentRoot;`
`38`	`39`	`$this->env = $env;`