Merge pull request #22 from JoshuaBehrens/feature-rewrite-config-files-with-env-calls

Rewrite config files with env calls

Author: daftspunk

src/DataWriter/Rewrite.php

@@ -19,6 +19,7 @@
  * - booleans
  * - nulls
  * - single-dimension arrays
+ * - default values in env function calls
  *
  * To do:
  * - When an entry does not exist, provide a way to create it
@@ -87,14 +88,15 @@ protected function parseContentValue(string $contents, string $path, $value): st
         $replaceValue = $this->writeValueToPhp($value);
 
         $count = 0;
-        $patterns = [];
-        $patterns[] = $this->buildStringExpression($key, $items);
-        $patterns[] = $this->buildStringExpression($key, $items, '"');
-        $patterns[] = $this->buildConstantExpression($key, $items);
-        $patterns[] = $this->buildArrayExpression($key, $items);
+        $patterns = array();
+        $patterns[$this->buildStringExpression($key, $items)] = '${1}${2}'.$replaceValue;
+        $patterns[$this->buildStringExpression($key, $items, '"')] = '${1}${2}'.$replaceValue;
+        $patterns[$this->buildEnvCallExpression($key, $items)] = '${1}${2}${4}' . $replaceValue . '${8}';
+        $patterns[$this->buildConstantExpression($key, $items)] = '${1}${2}'.$replaceValue;
+        $patterns[$this->buildArrayExpression($key, $items)] = '${1}${2}'.$replaceValue;
 
-        foreach ($patterns as $pattern) {
-            $result = preg_replace($pattern, '${1}${2}' . $replaceValue, $result, 1, $count);
+        foreach ($patterns as $pattern => $patternReplacement) {
+            $result = preg_replace($pattern, $patternReplacement, $result, 1, $count);
 
             if ($count > 0) {
                 break;
@@ -164,6 +166,22 @@ protected function buildStringExpression(string $targetKey, array $arrayItems =
         return '/' . implode('', $expression) . '/';
     }
 
+    protected function buildEnvCallExpression(string $targetKey, array $arrayItems = [])
+    {
+        $expression = array();
+
+        // Opening expression for array items ($1)
+        $expression[] = $this->buildArrayOpeningExpression($arrayItems);
+
+        // The target key opening
+        $expression[] = '(([\'"])' . $targetKey . '\3\s*=>\s*)';
+
+        // The method call
+        $expression[] = '(env\(([\'"]).*\5,\s*)([\'"])(.*)\6(\))';
+
+        return '/' . implode('', $expression) . '/';
+    }
+
     /**
      * Common constants only (true, false, null, integers)
      */

tests/Config/RewriteTest.php

@@ -110,6 +110,18 @@ public function testToContent()
 
         $this->assertArrayHasKey('aNumber', $result);
         $this->assertEquals(69, $result['aNumber']);
+
+        /*
+         * Rewrite config with values from env
+         */
+        $contents = $writer->toContent($contents, [
+            'envMethod' => 'default',
+            'nestedEnv.envMethod.envChild' => 'default',
+        ]);
+        $result = eval('?>'.$contents);
+
+        $this->assertEquals('default', $result['envMethod']);
+        $this->assertEquals('default', $result['nestedEnv']['envMethod']['envChild']);
     }
 
 }

tests/fixtures/Config/sample-config.php

@@ -23,6 +23,14 @@
 
     'aNumber' => 55,
 
+    'envMethod' => env('___KEY_FOR_ENV___', "unknown fallback value"),
+
+    'nestedEnv' => [
+        'envMethod' => [
+            'envChild' => env('___KEY_FOR_CHILD_ENV___', "unknown fallback child value"),
+        ],
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Application URL