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

Author: pamil

features/configuration/configuring_application_kernel.feature

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

src/ServiceContainer/SymfonyExtension.php

@@ -71,7 +71,7 @@ public function configure(ArrayNodeDefinition $builder): void
 
     public function load(ContainerBuilder $container, array $config): void
     {
-        $this->fallbackToTestEnvironment();
+        $this->setupTestEnvironment($config['kernel']['environment'] ?? 'test');
 
         $this->loadBootstrap($this->autodiscoverBootstrap($config['bootstrap']));
 
@@ -182,11 +182,11 @@ private function loadBootstrap(?string $bootstrap): void
         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) {
-            putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = 'test');
+            putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $fallback);
         }
     }