Merge pull request #13 from greg-1-anderson/server-instead-of-env

Fixes #9: Use $_SERVER instead of $_ENV for greater reliability.
grasmash · Feb 19, 2022 · 2c81d9d · 2c81d9d
2 parents 84c2561 + ddbf8e1
commit 2c81d9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Expander.php b/src/Expander.php
@@ -112,8 +112,8 @@ protected function doExpandArrayProperties(
             // Recursive case.
             if (is_array($value)) {
                 $this->doExpandArrayProperties($data, $value, $parent_keys . "$key.", $reference_data);
-            } // Base case.
-            else {
+            } else {
+                // Base case.
                 $this->expandStringProperties($data, $parent_keys, $reference_data, $value, $key);
             }
         }
@@ -208,8 +208,8 @@ public function expandStringPropertiesCallback(
         // Use only values within the subject array's data.
         if (!$reference_data) {
             return $this->expandProperty($property_name, $unexpanded_value, $data);
-        } // Search both the subject array's data and the reference data for a value.
-        else {
+        } else {
+            // Search both the subject array's data and the reference data for a value.
             return $this->expandPropertyWithReferenceData(
                 $property_name,
                 $unexpanded_value,
@@ -276,8 +276,8 @@ public function expandProperty($property_name, $unexpanded_value, $data)
         if (strpos($property_name, "env.") === 0 &&
           !$data->has($property_name)) {
             $env_key = substr($property_name, 4);
-            if (isset($_ENV[$env_key])) {
-              $data->set($property_name, $_ENV[$env_key]);
+            if (isset($_SERVER[$env_key])) {
+                $data->set($property_name, $_SERVER[$env_key]);
             }
         }
 

diff --git a/tests/phpunit/ExpanderTest.php b/tests/phpunit/ExpanderTest.php
@@ -22,7 +22,8 @@ public function testExpandArrayProperties(array $array, array $reference_array)
     {
         $expander = new Expander();
 
-        putenv("test=gomjabbar");
+        $this->setEnvVarFixture('test', 'gomjabbar');
+
         $expanded = $expander->expandArrayProperties($array);
         $this->assertEquals('gomjabbar', $expanded['env-test']);
         $this->assertEquals('Frank Herbert 1965', $expanded['book']['copyright']);
@@ -126,4 +127,10 @@ public function providerTestExpandProperty()
             [ ['book' =>  ['author' => 'Frank Herbert' ]], 'book.author', '${book.author}', 'Frank Herbert' ],
         ];
     }
+
+    protected function setEnvVarFixture($key, $value)
+    {
+        putenv("$key=$value");
+        $_SERVER[$key] = $value;
+    }
 }