Test the APP_ENV setting, and make sure it handles both and getenv() values.

Author: Crell

platformsh-flex-env.php

@@ -26,9 +26,7 @@ function mapPlatformShEnvironment() : void
     // Default to production. You can override this value by setting
     // `env:APP_ENV` as a project variable, or by adding it to the
     // .platform.app.yaml variables block.
-    if (!isset($_SERVER['APP_ENV'])) {
-        $_SERVER['APP_ENV'] = 'prod';
-    }
+    $_SERVER['APP_ENV'] = $_SERVER['APP_ENV'] ?? (getenv('APP_ENV') ?: null) ?? 'prod';
 
     if (!isset($_SERVER['DATABASE_URL'])) {
         mapPlatformShDatabase();

tests/FlexBridgeTest.php

@@ -36,4 +36,33 @@ public function testDontChangeAppSecret()
         $this->assertEquals('original', $_SERVER['APP_SECRET']);
     }
 
+    public function testAppEnvAlreadySetInServer()
+    {
+        putenv('PLATFORM_APPLICATION=test');
+        $_SERVER['APP_ENV'] = 'dev';
+
+        mapPlatformShEnvironment();
+
+        $this->assertEquals('dev', $_SERVER['APP_ENV']);
+    }
+
+    public function testAppEnvAlreadySetInEnv()
+    {
+        putenv('PLATFORM_APPLICATION=test');
+        putenv('APP_ENV=dev');
+
+        mapPlatformShEnvironment();
+
+        $this->assertEquals('dev', $_SERVER['APP_ENV']);
+    }
+
+    public function testAppEnvNeedsDefault()
+    {
+        putenv('PLATFORM_APPLICATION=test');
+
+        mapPlatformShEnvironment();
+
+        $this->assertEquals('prod', $_SERVER['APP_ENV']);
+    }
+
 }