Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2a878a4

Browse filesBrowse files
author
Amrouche Hamza
committed
[WebServerBundle] fix a bug where require would not require the good file because of env
1 parent e273d81 commit 2a878a4
Copy full SHA for 2a878a4

File tree

4 files changed

+4
-4
lines changed
Filter options

4 files changed

+4
-4
lines changed

‎src/Symfony/Bundle/WebServerBundle/Resources/router.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Resources/router.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
return false;
3131
}
3232

33-
$script = getenv('APP_FRONT_CONTROLLER') ?: 'index.php';
33+
$script = isset($_ENV['APP_FRONT_CONTROLLER']) ? $_ENV['APP_FRONT_CONTROLLER'] : 'index.php';
3434

3535
$_SERVER = array_merge($_SERVER, $_ENV);
3636
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;

‎src/Symfony/Bundle/WebServerBundle/WebServer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/WebServer.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private function createServerProcess(WebServerConfig $config)
150150
throw new \RuntimeException('Unable to find the PHP binary.');
151151
}
152152

153-
$process = new Process(array($binary, '-S', $config->getAddress(), $config->getRouter()));
153+
$process = new Process(array($binary, '-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter()));
154154
$process->setWorkingDirectory($config->getDocumentRoot());
155155
$process->setTimeout(null);
156156

‎src/Symfony/Bundle/WebServerBundle/WebServerConfig.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null
3232
throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env))));
3333
}
3434

35-
putenv('APP_FRONT_CONTROLLER='.$file);
35+
$_ENV['APP_FRONT_CONTROLLER'] = $file;
3636

3737
$this->documentRoot = $documentRoot;
3838
$this->env = $env;

‎src/Symfony/Bundle/WebServerBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^5.5.9|>=7.0.8",
2020
"symfony/console": "~3.3",
2121
"symfony/http-kernel": "~3.3",
22-
"symfony/process": "~3.3"
22+
"symfony/process": "~3.4.2"
2323
},
2424
"autoload": {
2525
"psr-4": { "Symfony\\Bundle\\WebServerBundle\\": "" },

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.