bug #50 Fallback to the "test" environment if no server/env variable is set (pamil)
This PR was merged into the 2.0-dev branch.
Discussion
----------
Commits
-------
de59f04531 Fallback to the "test" environment if no server/env variable is set
This commit is contained in:
@@ -36,6 +36,14 @@ Feature: Configuring application kernel
|
|||||||
|
|
||||||
assert($this->kernel->isDebug() === $map[$state]);
|
assert($this->kernel->isDebug() === $map[$state]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @Then the server and environment variable :variable is :value */
|
||||||
|
public function environmentVariableIs(string $variable, string $value): void
|
||||||
|
{
|
||||||
|
assert($_SERVER[$variable] === $value);
|
||||||
|
assert($_ENV[$variable] === $value);
|
||||||
|
assert(getenv($variable) === $value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
And a YAML services file containing:
|
And a YAML services file containing:
|
||||||
@@ -53,6 +61,7 @@ Feature: Configuring application kernel
|
|||||||
Feature:
|
Feature:
|
||||||
Scenario:
|
Scenario:
|
||||||
Then the application kernel should have environment "test"
|
Then the application kernel should have environment "test"
|
||||||
|
And the server and environment variable "APP_ENV" is "test"
|
||||||
And the application kernel should have debug enabled
|
And the application kernel should have debug enabled
|
||||||
"""
|
"""
|
||||||
When I run Behat
|
When I run Behat
|
||||||
|
|||||||
@@ -69,7 +69,9 @@ final class SymfonyExtension implements Extension
|
|||||||
|
|
||||||
public function load(ContainerBuilder $container, array $config): void
|
public function load(ContainerBuilder $container, array $config): void
|
||||||
{
|
{
|
||||||
$this->processBootstrap($this->autodiscoverBootstrap($config['bootstrap']));
|
$this->fallbackToTestEnvironment();
|
||||||
|
|
||||||
|
$this->loadBootstrap($this->autodiscoverBootstrap($config['bootstrap']));
|
||||||
|
|
||||||
$this->loadKernel($container, $this->autodiscoverKernelConfiguration($config['kernel']));
|
$this->loadKernel($container, $this->autodiscoverKernelConfiguration($config['kernel']));
|
||||||
$this->loadDriverKernel($container);
|
$this->loadDriverKernel($container);
|
||||||
@@ -161,6 +163,23 @@ final class SymfonyExtension implements Extension
|
|||||||
$container->setDefinition('fob_symfony.mink.parameters', $minkParametersDefinition);
|
$container->setDefinition('fob_symfony.mink.parameters', $minkParametersDefinition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function loadBootstrap(?string $bootstrap): void
|
||||||
|
{
|
||||||
|
if ($bootstrap === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once $bootstrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function fallbackToTestEnvironment(): void
|
||||||
|
{
|
||||||
|
// If there's no defined server / environment variable with an environment, default to test
|
||||||
|
if (($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV']) === null) {
|
||||||
|
putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = 'test');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function autodiscoverKernelConfiguration(array $config): array
|
private function autodiscoverKernelConfiguration(array $config): array
|
||||||
{
|
{
|
||||||
if ($config['class'] !== null) {
|
if ($config['class'] !== null) {
|
||||||
@@ -229,13 +248,4 @@ final class SymfonyExtension implements Extension
|
|||||||
|
|
||||||
return is_string($bootstrap) ? $bootstrap : null;
|
return is_string($bootstrap) ? $bootstrap : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function processBootstrap(?string $bootstrap): void
|
|
||||||
{
|
|
||||||
if ($bootstrap === null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once $bootstrap;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user