Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit b453abe5ea9b · 2024-09-17T14:51:32.000+02:00
* 7.1:
  [Process] minor fix
  [Process] Fix finding executables independently of open_basedir
  [HttpKernel] Skip logging uncaught exceptions in ErrorHandler, assume $kernel-&gt;terminateWithException() will do it
  [Serializer] Fix for method named `get()`
  [Notifier][TurboSMS] Process partial accepted response from transport
  parse empty sequence elements as null
  [HttpClient] Fix setting CURLMOPT_MAXCONNECTS
  throw a meaningful exception when parsing dotenv files with BOM
  [FrameworkBundle] Fix schema &amp; finish incomplete tests for lock &amp; semaphore config
  [Cache] Fix RedisSentinel params types
  [FrameworkBundle] Fix service reset between tests
  [Uid][Serializer][Validator] Mention RFC 9562
  make sure temp files can be cleaned up on Windows
diff --git a/Dotenv.php b/Dotenv.php
@@ -552,7 +552,13 @@ private function doLoad(bool $overrideExistingVars, array $paths): void
                 throw new PathException($path);
             }
 
-            $this->populate($this->parse(file_get_contents($path), $path), $overrideExistingVars);
+            $data = file_get_contents($path);
+
+            if ("\xEF\xBB\xBF" === substr($data, 0, 3)) {
+                throw new FormatException('Loading files starting with a byte-order-mark (BOM) is not supported.', new FormatExceptionContext($data, $path, 1, 0));
+            }
+
+            $this->populate($this->parse($data, $path), $overrideExistingVars);
         }
     }
 
diff --git a/Tests/DotenvTest.php b/Tests/DotenvTest.php
@@ -604,4 +604,14 @@ public function testBootEnv()
         $resetContext();
         rmdir($tmpdir);
     }
+
+    public function testExceptionWithBom()
+    {
+        $dotenv = new Dotenv();
+
+        $this->expectException(FormatException::class);
+        $this->expectExceptionMessage('Loading files starting with a byte-order-mark (BOM) is not supported.');
+
+        $dotenv->load(__DIR__.'/fixtures/file_with_bom');
+    }
 }
diff --git a/Tests/fixtures/file_with_bom b/Tests/fixtures/file_with_bom
@@ -0,0 +1 @@
+﻿FOO=BAR

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,13 @@ private function doLoad(bool $overrideExistingVars, array $paths): void`
`552`	`552`	`throw new PathException($path);`
`553`	`553`	`}`
`554`	`554`
`555`		`- $this->populate($this->parse(file_get_contents($path), $path), $overrideExistingVars);`
	`555`	`+ $data = file_get_contents($path);`
	`556`	`+`
	`557`	`+ if ("\xEF\xBB\xBF" === substr($data, 0, 3)) {`
	`558`	`+ throw new FormatException('Loading files starting with a byte-order-mark (BOM) is not supported.', new FormatExceptionContext($data, $path, 1, 0));`
	`559`	`+ }`
	`560`	`+`
	`561`	`+ $this->populate($this->parse($data, $path), $overrideExistingVars);`
`556`	`562`	`}`
`557`	`563`	`}`
`558`	`564`