diff --git a/features/not_crashing_behat.feature b/features/not_crashing_behat.feature index a4916cd..fbad0c3 100644 --- a/features/not_crashing_behat.feature +++ b/features/not_crashing_behat.feature @@ -63,13 +63,13 @@ Feature: Not crashing Behat default: extensions: FriendsOfBehat\SymfonyExtension: - env_file: .env_in_memory + env_file: ../config/.env_in_memory kernel: path: src/MyKernel.php class: MyKernel bootstrap: ~ """ - And a file ".env_in_memory" containing: + And a file "../config/.env_in_memory" containing: """ APP_ENV=dev """ diff --git a/src/ServiceContainer/SymfonyExtension.php b/src/ServiceContainer/SymfonyExtension.php index a284a47..ca0dac1 100644 --- a/src/ServiceContainer/SymfonyExtension.php +++ b/src/ServiceContainer/SymfonyExtension.php @@ -115,8 +115,9 @@ final class SymfonyExtension implements Extension public function load(ContainerBuilder $container, array $config): void { if (null !== $config['env_file']) { - $envFile = file_exists($config['env_file']) ? $config['env_file'] : $config['env_file'].'.dist'; - $this->loadEnvVars($container, $envFile); + $envFilePath = sprintf('%s/%s', $container->getParameter('paths.base'), $config['env_file']); + $envFilePath = file_exists($envFilePath) ? $envFilePath : $envFilePath.'.dist'; + (new Dotenv())->load($envFilePath); $environment = false !== getenv('APP_ENV') ? getenv('APP_ENV') : self::DEFAULT_ENV; $debugMode = false !== getenv('APP_DEBUG') ? getenv('APP_DEBUG') : self::DEBUG_MODE; @@ -144,16 +145,6 @@ final class SymfonyExtension implements Extension { } - /** - * @param ContainerBuilder $container - * @param string $fileName - */ - private function loadEnvVars(ContainerBuilder $container, string $fileName): void - { - $envFilePath = sprintf('%s/%s', $container->getParameter('paths.base'), $fileName); - (new Dotenv())->load($envFilePath); - } - /** * @param ContainerBuilder $container */