Skip to content

[TASK] set env variables based on $_SERVER #65

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[TASK] set env variables based on $_SERVER #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2e289c
[TASK] set env variables based on $_SERVER
lewisvoncken Jun 4, 2019
2af1488
[TASK] Updated test to use $_SERVER and not getenv
lewisvoncken Jun 5, 2019
2672341
- Cleanup logic for environment varibale merge case
tjwiebell Jun 6, 2019
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
6 changes: 5 additions & 1 deletion dev/bootstrap-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
exit(1);
}

$upwardConfig = getenv('UPWARD_PHP_UPWARD_PATH');
// populate the $_SERVER superglobal with environment variables if we're running with PHP's built-in server
if (PHP_SAPI === 'cli-server') {
$_SERVER = array_merge(getenv(), $_SERVER);
}
$upwardConfig = $_SERVER['UPWARD_PHP_UPWARD_PATH'] ?? null;
if (!$upwardConfig) {
echo 'No path to UPWARD YAML file provided.' . PHP_EOL;
exit(1);
Expand Down
2 changes: 1 addition & 1 deletion src/Context.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function fromRequest(Request $request): self
'query' => $request->getQuery()->toArray(),
],
],
'env' => getenv(),
'env' => $_SERVER,
]);
}

Expand Down
4 changes: 2 additions & 2 deletions test/ContextTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public function testFromRequest(): void
$request->shouldReceive('getUri->getQuery')
->andReturn('query=query-value');

putenv('ENV_NAME=envValue');
$subject = Context::fromRequest($request);
$_SERVER['ENV_NAME'] = 'envValue';
$subject = Context::fromRequest($request);

verify($subject->get('request.headers.Request-Header'))->is()->sameAs('header value');
verify($subject->get('request.headerEntries.0.key'))->is()->sameAs('Request-Header');
Expand Down