From 26fe9f4493dbf3470e8a673118ff6bcda8aefe3f Mon Sep 17 00:00:00 2001
From: Matthias Van Woensel <matthias.vanwoensel@platform.sh>
Date: Wed, 12 Feb 2025 10:15:14 +0100
Subject: [PATCH] fix: ENVIRONMENT_TYPE needs to be used to check
 onProduction()

---
 src/Config.php       | 29 ++++++++++++++++++++++++++---
 tests/ConfigTest.php | 18 ++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/Config.php b/src/Config.php
index 9c220ac..0ccce7d 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -35,6 +35,8 @@
  *   The Git branch name.
  * @property-read string $environment
  *   The environment ID (usually the Git branch plus a hash).
+ * @property-read string $environmentType
+ *   The environmentType (prod, staging, dev)
  * @property-read string $documentRoot
  *   The absolute path to the web root of the application.
  * @property-read string $smtpHost
@@ -76,6 +78,7 @@ class Config
     protected $directVariablesRuntime = [
         'branch' => 'BRANCH',
         'environment' => 'ENVIRONMENT',
+        'environmentType' => 'ENVIRONMENT_TYPE',
         'documentRoot' => 'DOCUMENT_ROOT',
         'smtpHost' => 'SMTP_HOST',
     ];
@@ -437,9 +440,16 @@ public function onProduction() : bool
             return false;
         }
 
-        $prodBranch = $this->onDedicated() ? 'production' : 'master';
-
-        return $this->getValue('BRANCH') == $prodBranch;
+        // we need to first confirm that we actually have the `ENVIRONMENT_TYPE` variable, 
+        // because not all legacy containers will have this
+        if($this->hasVariable('ENVIRONMENT_TYPE')) {
+            // correct way of checking production branch
+            return $this->getValue('ENVIRONMENT_TYPE') == 'production';
+        } else {
+            // legacy way of checking production type
+            $prodBranch = $this->onDedicated() ? 'production' : 'master';
+            return $this->getValue('BRANCH') == $prodBranch;
+        }
     }
 
     /**
@@ -498,6 +508,19 @@ public function hasRelationship(string $relationship) : bool
         return isset($this->relationshipsDef[$relationship]);
     }
 
+    /**
+     * Check if an environment variable exists, useful for backwards compatibility checks
+     *
+     * @param string $name
+     *   The env variable to check.
+     * @return bool
+     */
+    protected function hasVariable(string $name) :?bool
+    {
+        $checkName = $this->envPrefix . strtoupper($name);
+
+        return array_key_exists($checkName, $this->environmentVariables);
+    }
     /**
      * Reads an environment variable, taking the prefix into account.
      *
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 862ea33..17b8e19 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -200,6 +200,24 @@ public function test_ondedicated_returns_false_on_standard() : void
         $this->assertFalse($config->onDedicated());
     }
 
+    public function test_onproduction_prod_is_true() : void
+    {
+        $env = $this->mockEnvironmentDeploy;
+        $env['PLATFORM_ENVIRONMENT_TYPE'] = 'production';
+        $config = new Config($env);
+
+        $this->assertTrue($config->onProduction());
+    }
+
+    public function test_onproduction_stg_is_false() : void
+    {
+        $env = $this->mockEnvironmentDeploy;
+        $env['PLATFORM_ENVIRONMENT_TYPE'] = 'staging';
+        $config = new Config($env);
+
+        $this->assertFalse($config->onProduction());
+    }
+
     public function test_onproduction_on_dedicated_prod_is_true() : void
     {
         $env = $this->mockEnvironmentDeploy;