Merge 4ca1dfd into faac3a4

grasmash · Dec 16, 2017 · 0730e88 · 0730e88
2 parents faac3a4 + 4ca1dfd
commit 0730e88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/Expander.php b/src/Expander.php
@@ -241,6 +241,14 @@ public static function expandPropertyWithReferenceData(
      */
     public static function expandProperty($property_name, $unexpanded_value, $data)
     {
+        if (strpos($property_name, "env.") === 0 &&
+          !$data->has($property_name)) {
+            $env_key = substr($property_name, 4);
+            if (getenv($env_key)) {
+                $data->set($property_name, getenv($env_key));
+            }
+        }
+
         if (!$data->has($property_name)) {
             self::log("Property \${'$property_name'} could not be expanded.");
             return $unexpanded_value;

diff --git a/tests/phpunit/ExpanderTest.php b/tests/phpunit/ExpanderTest.php
@@ -21,7 +21,9 @@ class ExpanderTest extends \PHPUnit_Framework_TestCase
     public function testExpandArrayProperties($filename, $reference_array)
     {
         $array = Yaml::parse(file_get_contents(__DIR__ . "/../resources/$filename"));
+        putenv("test=gomjabbar");
         $expanded = Expander::expandArrayProperties($array);
+        $this->assertEquals('gomjabbar', $expanded['env-test']);
         $this->assertEquals('Frank Herbert 1965', $expanded['book']['copyright']);
         $this->assertEquals('Paul Atreides', $expanded['book']['protaganist']);
         $this->assertEquals('Dune by Frank Herbert', $expanded['summary']);

diff --git a/tests/resources/valid.yml b/tests/resources/valid.yml
@@ -31,4 +31,5 @@ product-name: ${${type}.title}
 boolean-value: true
 null-value: null
 inline-array: [ one, two, three ]
-expand-array: ${inline-array}
+expand-array: ${inline-array}
+env-test: ${env.test}