Commita34731e

committed

allow environment variables starting with an underscore

1 parent6d288bf commita34731eCopy full SHA for a34731e

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`finalclass Dotenv`
`27`	`27`	`{`
`28`		`-publicconstVARNAME_REGEX ='(?i:[A-Z][A-Z0-9_]*+)';`
	`28`	`+publicconstVARNAME_REGEX ='(?i:_?[A-Z][A-Z0-9_]*+)';`
`29`	`29`	`publicconstSTATE_VARNAME =0;`
`30`	`30`	`publicconstSTATE_VALUE =1;`
`31`	`31`
`@@ -351,8 +351,8 @@ private function lexValue(): string`
`351`	`351`	`++$this->cursor;`
`352`	`352`	`$value =str_replace(['\\"','\r','\n'], ['"',"\r","\n"],$value);`
`353`	`353`	`$resolvedValue =$value;`
`354`		`-$resolvedValue =$this->resolveVariables($resolvedValue,$loadedVars);`
`355`	`354`	`$resolvedValue =$this->resolveCommands($resolvedValue,$loadedVars);`
	`355`	`+$resolvedValue =$this->resolveVariables($resolvedValue,$loadedVars);`
`356`	`356`	`$resolvedValue =str_replace('\\\\','\\',$resolvedValue);`
`357`	`357`	`$v .=$resolvedValue;`
`358`	`358`	`}else {`
`@@ -374,8 +374,8 @@ private function lexValue(): string`
`374`	`374`	`}`
`375`	`375`	`$value =rtrim($value);`
`376`	`376`	`$resolvedValue =$value;`
`377`		`-$resolvedValue =$this->resolveVariables($resolvedValue,$loadedVars);`
`378`	`377`	`$resolvedValue =$this->resolveCommands($resolvedValue,$loadedVars);`
	`378`	`+$resolvedValue =$this->resolveVariables($resolvedValue,$loadedVars);`
`379`	`379`	`$resolvedValue =str_replace('\\\\','\\',$resolvedValue);`
`380`	`380`
`381`	`381`	`if ($resolvedValue ===$value &&preg_match('/\s+/',$value)) {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public static function getEnvDataWithFormatErrors()`
`53`	`53`	`["FOO=\nBAR=\${FOO:-\'a{a}a}","Unsupported character\"'\" found in the default value of variable\"\$FOO\". in\".env\" at line 2.\n...\\nBAR=\${FOO:-\'a{a}a}...\n ^ line 2 offset 24"],`
`54`	`54`	`["FOO=\nBAR=\${FOO:-a\$a}","Unsupported character\"\$\" found in the default value of variable\"\$FOO\". in\".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\$a}...\n ^ line 2 offset 20"],`
`55`	`55`	`["FOO=\nBAR=\${FOO:-a\"a}","Unclosed braces on variable expansion in\".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\"a}...\n ^ line 2 offset 17"],`
	`56`	`+ ['_=FOO',"Invalid character in variable name in\".env\" at line 1.\n..._=FOO...\n ^ line 1 offset 0"],`
`56`	`57`	`];`
`57`	`58`
`58`	`59`	`if ('\\' !== \DIRECTORY_SEPARATOR) {`
`@@ -175,6 +176,10 @@ public static function getEnvData()`
`175`	`176`	`["FOO=\nBAR=\${FOO:=TEST}", ['FOO' =>'TEST','BAR' =>'TEST']],`
`176`	`177`	`["FOO=\nBAR=\$FOO:=TEST}", ['FOO' =>'TEST','BAR' =>'TEST}']],`
`177`	`178`	`["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' =>'foo','FOOBAR' =>'foo']],`
	`179`	`+`
	`180`	`+// underscores`
	`181`	`+ ['_FOO=BAR', ['_FOO' =>'BAR']],`
	`182`	`+ ['_FOO_BAR=FOOBAR', ['_FOO_BAR' =>'FOOBAR']],`
`178`	`183`	`];`
`179`	`184`
`180`	`185`	`if ('\\' !== \DIRECTORY_SEPARATOR) {`

Comments

(0)