veyra/friends-of-behat-symfony-extension
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #123 from ubermuda/feature/use-config-environment-for-app-env

Browse Source
This commit is contained in:
Kamil Kokot
2021-10-20 13:52:16 +02:00
committed by GitHub
parent 7d022743ea 880893206f
commit c112c8f25f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
features/configuration/configuring_application_kernel.feature
View File

@@ -81,6 +81,7 @@ Feature: Configuring application kernel
Feature: Feature:
Scenario: Scenario:
Then the application kernel should have environment "custom" Then the application kernel should have environment "custom"
And the server and environment variable "APP_ENV" is "custom"
""" """
When I run Behat When I run Behat
Then it should pass Then it should pass

8
src/ServiceContainer/SymfonyExtension.php
View File

@@ -71,7 +71,7 @@ final class SymfonyExtension implements Extension
public function load(ContainerBuilder $container, array $config): void public function load(ContainerBuilder $container, array $config): void
{ {
$this->fallbackToTestEnvironment(); $this->setupTestEnvironment($config['kernel']['environment'] ?? 'test');
$this->loadBootstrap($this->autodiscoverBootstrap($config['bootstrap'])); $this->loadBootstrap($this->autodiscoverBootstrap($config['bootstrap']));
@@ -182,11 +182,11 @@ final class SymfonyExtension implements Extension
require_once $bootstrap; require_once $bootstrap;
} }
private function fallbackToTestEnvironment(): void private function setupTestEnvironment(string $fallback): void
{ {
// If there's no defined server / environment variable with an environment, default to test // If there's no defined server / environment variable with an environment, default to configured fallback
if (($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) === null) { if (($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) === null) {
putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = 'test'); putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $fallback);
} }
} }