Merge pull request #3 from adhocore/develop

Develop

Author: adhocore

readme.md

@@ -43,7 +43,7 @@ use Ahc\Env\Loader;
 
 ### ENV Format
 
-Supports `#` or `;` comments and multilines. Literal double quote should be escaped like `\"`. See more examples below:
+Supports `#` or `;` comments. Literal double quote should be escaped like `""`. See more examples below:
 
 ```
 # comment line
@@ -54,17 +54,25 @@ c=$3#
 d="lol"
 # empty
 e=
-f=\"6\"
+# f is `"6"`
+f=""6""
 1_2=one_two
 # empty too
 E=""
 A_B=Apple Ball
-# multiline
-MUL="line 1
-line 2"
 x=Y
 ```
 
+Reference is possible like so:
+
+```
+MAIN=1
+REF=${MAIN}/2
+REF2=${REF}/3
+# below will not be parsed as INV is not resolved
+REF3=${INV}
+```
+
 ### Retrieving
 
 ```php

src/Loader.php

@@ -49,12 +49,9 @@ public function load($file, $override = false, $mode = self::PUTENV)
             throw new \InvalidArgumentException('The .env file does not exist or is not readable');
         }
 
-        // Get file contents, fix the comments, quote the values and parse as ini.
+        // Get file contents, fix the comments and parse as ini.
         $content = \preg_replace('/^\s*#/m', ';', \file_get_contents($file));
-        $content = \preg_replace('/=([^"\r?\n].*)$/Um', '="$1"', $content);
-
-        $flag    = defined('INI_SCANNER_TYPED') ? \INI_SCANNER_TYPED : \INI_SCANNER_NORMAL;
-        $parsed  = \parse_ini_string($content, false, $flag);
+        $parsed  = \parse_ini_string($content, false, INI_SCANNER_RAW);
 
         if ($parsed === false) {
             throw new \RuntimeException('The .env file cannot be parsed due to malformed values');
@@ -80,12 +77,25 @@ 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);
         }
     }
 
+    protected function resolveRef($value)
+    {
+        if (!$value || \strpos($value, '${') === false) {
+            return $value;
+        }
+
+        return \preg_replace_callback('~\$\{(\w+)\}~', function ($m) {
+            return (null === $ref = Retriever::getEnv($m[1], null)) ? $m[0] : $ref;
+        }, $value);
+    }
+
     private function toEnv($key, $value, $mode)
     {
         if ($mode & self::ENV) {

tests/LoaderTest.php

@@ -22,7 +22,6 @@ public function testLoadPutenv()
         $this->assertEquals('"6"', getenv('f'), 'Escaped numeric string');
         $this->assertEquals('one_two', getenv('1_2'), 'Underscored string');
         $this->assertEquals('Apple Ball', getenv('A_B'), 'Multi word string');
-        $this->assertEquals("line 1\nline 2", getenv('MUL'), 'Multi line string');
 
         $this->assertFalse(getenv('MuL'), 'Key should be case sensitive');
 
@@ -47,7 +46,6 @@ public function testLoadGlobals()
             $this->assertEquals('"6"', $source['f'], 'Escaped numeric string');
             $this->assertEquals('one_two', $source['1_2'], 'Underscored string');
             $this->assertEquals('Apple Ball', $source['A_B'], 'Multi word string');
-            $this->assertEquals("line 1\nline 2", $source['MUL'], 'Multi line string');
 
             $this->assertArrayNotHasKey('mUl', $source, 'Key should be case sensitive');
         }
@@ -71,7 +69,6 @@ public function testLoadOverrideAll()
         $this->assertEquals('o$3#', getenv('c'), 'Unquoted string new');
         $this->assertEquals('olol', getenv('d'), 'Quoted string new');
         $this->assertEquals('"o6"', getenv('f'), 'Escaped numeric string new');
-        $this->assertEquals("oline 1\nline 2", getenv('MUL'), 'Multi line string new');
 
         foreach (['SERVER', 'ENV'] as $name) {
             $source = $name === 'ENV' ? $_ENV : $_SERVER;
@@ -81,17 +78,24 @@ public function testLoadOverrideAll()
             $this->assertNotEquals('$3#', $source['c'], 'Unquoted string old');
             $this->assertNotEquals('lol', $source['d'], 'Quoted string old');
             $this->assertNotEquals('"6"', $source['f'], 'Escaped numeric string old');
-            $this->assertNotEquals("line 1\nline 2", $source['MUL'], 'Multi line string old');
 
             $this->assertEquals('o1', $source['a'], 'Unquoted number new');
             $this->assertEquals('o2', $source['b'], 'Quoted number new');
             $this->assertEquals('o$3#', $source['c'], 'Unquoted string new');
             $this->assertEquals('olol', $source['d'], 'Quoted string new');
             $this->assertEquals('"o6"', $source['f'], 'Escaped numeric string new');
-            $this->assertEquals("oline 1\nline 2", $source['MUL'], 'Multi line string new');
         }
     }
 
+    public function testRef()
+    {
+        (new Loader)->load(__DIR__ . '/stubs/ref.env');
+
+        $this->assertSame('1/2', getenv('REF'));
+        $this->assertSame('1/2/3', getenv('REF2'));
+        $this->assertSame('${INV}', getenv('REF3'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The .env file does not exist or is not readable

tests/stubs/override.env

@@ -5,6 +5,4 @@ c=o$3#
 ; also comment line
 d="olol"
 e=
-f=\"o6\"
-MUL="oline 1
-line 2"
+f=""o6""

tests/stubs/ref.env

@@ -0,0 +1,5 @@
+# comment line
+MAIN=1
+REF=${MAIN}/2
+REF2=${REF}/3
+REF3=${INV}

tests/stubs/test.env

@@ -5,10 +5,9 @@ c=$3#
 ; also comment line
 d="lol"
 e=
-f=\"6\"
+f=""6""
 1_2=one_two
 E=""
 A_B=Apple Ball
-MUL="line 1
-line 2"
+MUL="line 1line 2"
 x=Y