summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-11-04 23:56:19 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-11-04 23:56:19 +0000
commit09a0b4fc622e4780bc0c9e9dd7ec6a13a03dbf4f (patch)
tree93468cbf4a24a1f025c22abb102757081892503b /vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
parent35b016d961c6f782ac75e89afa6ca4acd0773662 (diff)
downloadwebtrees-09a0b4fc622e4780bc0c9e9dd7ec6a13a03dbf4f.tar.gz
webtrees-09a0b4fc622e4780bc0c9e9dd7ec6a13a03dbf4f.tar.bz2
webtrees-09a0b4fc622e4780bc0c9e9dd7ec6a13a03dbf4f.zip
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php')
-rw-r--r--vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php b/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
index 32624c963f..144ef46742 100644
--- a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -49,7 +49,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
}
}
- $content = null;
try {
$content = $request->getContent();
} catch (\LogicException $e) {
@@ -59,7 +58,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
$sessionMetadata = [];
$sessionAttributes = [];
- $session = null;
$flashes = [];
if ($request->hasSession()) {
$session = $request->getSession();
@@ -80,9 +78,9 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
}
$dotenvVars = [];
- foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
- if ('' !== $name && false !== $value = getenv($name)) {
- $dotenvVars[$name] = $value;
+ foreach (explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '') as $name) {
+ if ('' !== $name && isset($_ENV[$name])) {
+ $dotenvVars[$name] = $_ENV[$name];
}
}