Merge pull request #215 from arifmahmudrana/remove-double-instantiation-loader-class-and-add-set-immutable-method

remove double instantiation of loader class

Author: vlucas

src/Dotenv.php

@@ -86,9 +86,7 @@ protected function getFilePath($path, $file)
      */
     protected function loadData($overload = false)
     {
-        $this->loader = new Loader($this->filePath, !$overload);
-
-        return $this->loader->load();
+        return $this->loader->setImmutable(!$overload)->load();
     }
 
     /**

src/Loader.php

@@ -42,6 +42,29 @@ public function __construct($filePath, $immutable = false)
         $this->immutable = $immutable;
     }
 
+    /**
+     * Set immutable value.
+     *
+     * @param bool $immutable
+     * @return $this
+     */
+    public function setImmutable($immutable = false)
+    {
+        $this->immutable = $immutable;
+
+        return $this;
+    }
+
+    /**
+     * Set immutable value.
+     *
+     * @return bool
+     */
+    public function getImmutable()
+    {
+        return $this->immutable;
+    }
+
     /**
      * Load `.env` file in given directory.
      *

tests/Dotenv/LoaderTest.php

@@ -74,6 +74,17 @@ protected function value()
         return reset($keyVal);
     }
 
+    public function testMutableLoaderSetUnsetImmutable()
+    {
+        $immutable = $this->mutableLoader->getImmutable();
+
+        // Set Immutable.
+        $this->mutableLoader->setImmutable(!$immutable);
+        $this->assertSame(!$immutable, $this->mutableLoader->getImmutable());
+        $this->mutableLoader->setImmutable($immutable);
+        $this->assertSame($immutable, $this->mutableLoader->getImmutable());
+    }
+
     public function testMutableLoaderClearsEnvironmentVars()
     {
         // Set an environment variable.
@@ -87,6 +98,17 @@ public function testMutableLoaderClearsEnvironmentVars()
         $this->assertSame(false, isset($_SERVER[$this->key()]));
     }
 
+    public function testImmutableLoaderSetUnsetImmutable()
+    {
+        $immutable = $this->immutableLoader->getImmutable();
+
+        // Set Immutable.
+        $this->immutableLoader->setImmutable(!$immutable);
+        $this->assertSame(!$immutable, $this->immutableLoader->getImmutable());
+        $this->immutableLoader->setImmutable($immutable);
+        $this->assertSame($immutable, $this->immutableLoader->getImmutable());
+    }
+
     public function testImmutableLoaderCannotClearEnvironmentVars()
     {
         // Set an environment variable.