Commitde314bf

committed

throw a meaningful exception when parsing dotenv files with BOM

1 parente104cd2 commitde314bfCopy full SHA for de314bf

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,13 @@ private function doLoad(bool $overrideExistingVars, array $paths): void`
`568`	`568`	`thrownewPathException($path);`
`569`	`569`	`}`
`570`	`570`
`571`		`-$this->populate($this->parse(file_get_contents($path),$path),$overrideExistingVars);`
	`571`	`+$data =file_get_contents($path);`
	`572`	`+`
	`573`	`+if ("\xEF\xBB\xBF" ===substr($data,0,3)) {`
	`574`	`+thrownewFormatException('Loading files starting with a byte-order-mark is not supported.',newFormatExceptionContext($data,$path,1,0));`
	`575`	`+ }`
	`576`	`+`
	`577`	`+$this->populate($this->parse($data,$path),$overrideExistingVars);`
`572`	`578`	`}`
`573`	`579`	`}`
`574`	`580`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -604,4 +604,14 @@ public function testBootEnv()`
`604`	`604`	`$resetContext();`
`605`	`605`	`rmdir($tmpdir);`
`606`	`606`	`}`
	`607`	`+`
	`608`	`+publicfunctiontestExceptionWithBom()`
	`609`	`+ {`
	`610`	`+$dotenv =newDotenv();`
	`611`	`+`
	`612`	`+$this->expectException(FormatException::class);`
	`613`	`+$this->expectExceptionMessage('Loading files starting with a byte-order-mark is not supported.');`
	`614`	`+`
	`615`	`+$dotenv->load(__DIR__.'/fixtures/file_with_bom');`
	`616`	`+ }`
`607`	`617`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+FOO=BAR`

Comments

(0)