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

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/WebServerBundle/Resources/router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
return false;
}

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

$_SERVER = array_merge($_SERVER, $_ENV);
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/WebServerBundle/WebServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private function createServerProcess(WebServerConfig $config)
throw new \RuntimeException('Unable to find the PHP binary.');
}

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

Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null
throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env))));
}

putenv('APP_FRONT_CONTROLLER='.$file);
$_ENV['APP_FRONT_CONTROLLER'] = $file;

$this->documentRoot = $documentRoot;
$this->env = $env;
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/WebServerBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": "^5.5.9|>=7.0.8",
"symfony/console": "~3.3",
"symfony/http-kernel": "~3.3",
"symfony/process": "~3.3"
"symfony/process": "~3.3.14"
Copy link
Member

@stof stof Dec 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this now forbids using 3.4, so not good. Should be ~3.3.14 || ^3.4.2

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was patched while merged, see 743be09

},
"autoload": {
"psr-4": { "Symfony\\Bundle\\WebServerBundle\\": "" },
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.