[Dotenv] Make load() variadic

chalasr · chalasr · commit 96081cd69d55 · 2017-06-20T23:13:16.000+02:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -45,10 +45,11 @@ final class Dotenv
      * @throws FormatException when a file has a syntax error
      * @throws PathException   when a file does not exist or is not readable
      */
-    public function load($path/*, ...$paths*/)
+    public function load($path, ...$paths)
     {
-        // func_get_args() to be replaced by a variadic argument for Symfony 4.0
-        foreach (func_get_args() as $path) {
+        array_unshift($paths, $path);
+
+        foreach ($paths as $path) {
             if (!is_readable($path) || is_dir($path)) {
                 throw new PathException($path);
             }
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -155,6 +155,28 @@ public function testLoadDirectory()
         $dotenv->load(__DIR__);
     }
 
+    public function testLoad()
+    {
+        @mkdir($tmpdir = sys_get_temp_dir().'/dotenv');
+
+        $path1 = tempnam($tmpdir, 'sf-');
+        $path2 = tempnam($tmpdir, 'sf-');
+
+        file_put_contents($path1, 'FOO=BAR');
+        file_put_contents($path2, 'BAR=BAZ');
+
+        (new DotEnv())->load($path1, $path2);
+
+        $this->assertSame('BAR', getenv('FOO'));
+        $this->assertSame('BAZ', getenv('BAR'));
+
+        putenv('FOO');
+        putenv('BAR');
+        unlink($path1);
+        unlink($path2);
+        rmdir($tmpdir);
+    }
+
     public function testServerSuperglobalIsNotOverriden()
     {
         $originalValue = $_SERVER['argc'];
