Merge pull request #6625 from paulbalandan/dotenv-export

Fix DotEnv class turning `export` to empty string

Author: paulbalandan

system/Config/DotEnv.php

@@ -116,7 +116,8 @@ public function normaliseVariable(string $name, string $value = ''): array
         $value = trim($value);
 
         // Sanitize the name
-        $name = str_replace(['export', '\'', '"'], '', $name);
+        $name = preg_replace('/^export[ \t]++(\S+)/', '$1', $name);
+        $name = str_replace(['\'', '"'], '', $name);
 
         // Sanitize the value
         $value = $this->sanitizeValue($value);

tests/system/Config/DotEnvTest.php

@@ -55,14 +55,30 @@ public function testReturnsFalseIfCannotFindFile()
         $this->assertFalse($dotenv->load());
     }
 
-    public function testLoadsVars()
+    /**
+     * @dataProvider provideLoadVars
+     */
+    public function testLoadsVars(string $expected, string $varname)
     {
         $dotenv = new DotEnv($this->fixturesFolder);
         $dotenv->load();
-        $this->assertSame('bar', getenv('FOO'));
-        $this->assertSame('baz', getenv('BAR'));
-        $this->assertSame('with spaces', getenv('SPACED'));
-        $this->assertSame('', getenv('NULL'));
+
+        $this->assertSame($expected, getenv($varname));
+    }
+
+    public function provideLoadVars(): iterable
+    {
+        yield from [
+            ['bar', 'FOO'],
+            ['baz', 'BAR'],
+            ['with spaces', 'SPACED'],
+            ['', 'NULL'],
+            ['exported foo', 'char.expo.foo'],
+            ['variable', 'character.export.var'],
+            ['character', 'char.var'],
+            ['imports', 'char.exports'],
+            ['banana', 'fruit.export'],
+        ];
     }
 
     /**

tests/system/Config/fixtures/.env

@@ -4,6 +4,12 @@ SPACED="with spaces"
 
 NULL=
 
+char.expo.foo="exported foo"
+character.export.var=variable
+export char.var=character
+export char.exports=imports
+fruit.export = "banana"
+
 SimpleConfig.onedeep=baz
 SimpleConfig.default.name=ci4
 # Use underscore as separator