Merge pull request #5 from adhocore/4-delayed-ref

4 delayed ref

Author: adhocore

src/Loader.php

@@ -86,23 +86,32 @@ protected function setEnv(array $vars, $override, $mode = self::PUTENV)
                 continue;
             }
 
-            $value = $this->resolveRef($value);
-
-            $this->toEnv($key, $value, $mode);
-            $this->toServer($key, $value, $mode);
-            $this->toPutenv($key, $value, $mode);
+            $this->set($key, $value, $mode);
         }
+
+        $this->resolveRefs($vars, $mode);
     }
 
-    protected function resolveRef($value)
+    protected function set($key, $value, $mode)
     {
-        if (!$value || \strpos($value, '${') === false) {
-            return $value;
-        }
+        $this->toEnv($key, $value, $mode);
+        $this->toServer($key, $value, $mode);
+        $this->toPutenv($key, $value, $mode);
+    }
 
-        return \preg_replace_callback('~\$\{(\w+)\}~', function ($m) {
-            return (null === $ref = Retriever::getEnv($m[1], null)) ? $m[0] : $ref;
-        }, $value);
+    protected function resolveRefs($vars, $mode)
+    {
+        foreach ($vars as $key => $value) {
+            if (!$value || \strpos($value, '${') === false) {
+                continue;
+            }
+
+            $value = \preg_replace_callback('~\$\{(\w+)\}~', function ($m) {
+                return (null === $ref = Retriever::getEnv($m[1], null)) ? $m[0] : $ref;
+            }, $value);
+
+            $this->set($key, $value, $mode);
+        }
     }
 
     private function toEnv($key, $value, $mode)

src/functions.php

@@ -27,4 +27,3 @@ function env($key, $default = null, $filter = null, $options = null)
         return \Ahc\Env\Retriever::getEnv($key, $default, $filter, $options);
     }
 }
-// @codeCoverageIgnoreEnd

tests/stubs/ref.env

@@ -1,5 +1,6 @@
 # comment line
-MAIN=1
 REF=${MAIN}/2
 REF2=${REF}/3
 REF3=${INV}
+# intentionally define MAIN after it is referenced
+MAIN=1