Merge pull request vlucas#183 from xxnoobmanxx/patch-1

GrahamCampbell · web-flow · commit c3f02441daa6 · 2016-06-14T15:09:15.000+01:00
Avoid code duplication
diff --git a/src/Dotenv.php b/src/Dotenv.php
@@ -45,9 +45,7 @@ public function __construct($path, $file = '.env')
      */
     public function load()
     {
-        $this->loader = new Loader($this->filePath, true);
-
-        return $this->loader->load();
+        return $this->getLoaderData();
     }
 
     /**
@@ -57,9 +55,7 @@ public function load()
      */
     public function overload()
     {
-        $this->loader = new Loader($this->filePath, false);
-
-        return $this->loader->load();
+        return $this->getLoaderData(true);
     }
 
     /**
@@ -80,6 +76,16 @@ protected function getFilePath($path, $file)
 
         return $filePath;
     }
+    
+    /**
+     * Load data from '.env'
+     * @return array
+     */
+    private function getLoaderData($overload = false)
+    {
+        $this->loader = new Loader($this->filePath, !$overload);
+        return $this->loader->load();
+    }
 
     /**
      * Required ensures that the specified variables exist, and returns a new Validator object.
