Commaaa2

vendor/vlucas/phpdotenv/src/Store/FileStore.php

@@ -1,44 +1,55 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Dotenv\Store;
 
 use Dotenv\Exception\InvalidPathException;
 use Dotenv\Store\File\Reader;
 
-class FileStore implements StoreInterface
+final class FileStore implements StoreInterface
 {
     /**
      * The file paths.
      *
      * @var string[]
      */
-    protected $filePaths;
+    private $filePaths;
 
     /**
      * Should file loading short circuit?
      *
      * @var bool
      */
-    protected $shortCircuit;
+    private $shortCircuit;
+
+    /**
+     * The file encoding.
+     *
+     * @var string|null
+     */
+    private $fileEncoding;
 
     /**
      * Create a new file store instance.
      *
-     * @param string[] $filePaths
-     * @param bool     $shortCircuit
+     * @param string[]    $filePaths
+     * @param bool        $shortCircuit
+     * @param string|null $fileEncoding
      *
      * @return void
      */
-    public function __construct(array $filePaths, $shortCircuit)
+    public function __construct(array $filePaths, bool $shortCircuit, ?string $fileEncoding = null)
     {
         $this->filePaths = $filePaths;
         $this->shortCircuit = $shortCircuit;
+        $this->fileEncoding = $fileEncoding;
     }
 
     /**
      * Read the content of the environment file(s).
      *
-     * @throws \Dotenv\Exception\InvalidPathException
+     * @throws \Dotenv\Exception\InvalidEncodingException|\Dotenv\Exception\InvalidPathException
      *
      * @return string
      */
@@ -48,14 +59,14 @@ class FileStore implements StoreInterface
             throw new InvalidPathException('At least one environment file path must be provided.');
         }
 
-        $contents = Reader::read($this->filePaths, $this->shortCircuit);
+        $contents = Reader::read($this->filePaths, $this->shortCircuit, $this->fileEncoding);
 
-        if (count($contents) > 0) {
-            return implode("\n", $contents);
+        if (\count($contents) > 0) {
+            return \implode("\n", $contents);
         }
 
         throw new InvalidPathException(
-            sprintf('Unable to read any of the environment file(s) at [%s].', implode(', ', $this->filePaths))
+            \sprintf('Unable to read any of the environment file(s) at [%s].', \implode(', ', $this->filePaths))
         );
     }
 }