Merge pull request #102 from louim/allow_validation_without_load

Move loader creation to the constructor
vlucas · Jul 14, 2015 · 65e5231 · 65e5231
2 parents 1f20779 + 631e266
commit 65e5231
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Dotenv.php b/src/Dotenv.php
@@ -26,6 +26,7 @@ class Dotenv
     public function __construct($path, $file = '.env')
     {
         $this->filePath = $this->getFilePath($path, $file);
+        $this->loader = new Loader($this->filePath, $immutable = true);
     }
 
     /**
@@ -35,8 +36,6 @@ public function __construct($path, $file = '.env')
      */
     public function load()
     {
-        $this->loader = new Loader($this->filePath, $immutable = true);
-
         return $this->loader->load();
     }
 

diff --git a/tests/Dotenv/DotenvTest.php b/tests/Dotenv/DotenvTest.php
@@ -271,4 +271,14 @@ public function testDotenvHitsLastChain()
         $dotenv->load();
         $dotenv->required('ASSERTVAR3')->notEmpty();
     }
+
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessage One or more environment variables failed assertions: foo is missing
+     */
+    public function testDotenvValidateRequiredWithoutLoading()
+    {
+        $dotenv = new Dotenv($this->fixturesFolder, 'assertions.env');
+        $dotenv->required('foo');
+    }
 }