Fix 'missing ENVKEY' error when ENVKEY is set in $\_SERVER or $\_ENV …

…rather than a system environment variable
envkey · Oct 20, 2023 · fe151c6 · fe151c6
1 parent d40c386
commit fe151c6
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "envkey/envkey-php",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "Keeps environment variables automatically in sync. Protects secrets with end-to-end encryption.",
   "keywords": [
     "env",

diff --git a/composer.lock b/composer.lock
diff --git a/sdkphp-version.txt b/sdkphp-version.txt
@@ -1 +1 @@
-2.4.3
+2.4.4
diff --git a/src/Fetcher.php b/src/Fetcher.php
@@ -57,6 +57,14 @@ public static function fetch(){
     $composerData = json_decode($composerJson, true); // Decode the JSON into an associative array
     $version = $composerData['version']; // Access the 'version' property
 
+    // Check if ENVKEY is available in $_SERVER or $_ENV and set it as an environment variable
+    // ensures it gets passed through to envkey-source call
+    if (isset($_SERVER['ENVKEY'])) {
+      putenv("ENVKEY={$_SERVER['ENVKEY']}");
+    } elseif (isset($_ENV['ENVKEY'])) {
+      putenv("ENVKEY={$_ENV['ENVKEY']}");
+    }
+
     $cmd = self::libPath().' --json --mem-cache --client-name envkey-php --client-version '.$version;
     $res = rtrim(shell_exec($cmd));