update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.
This commit is contained in:
Sujit Prasad
2016-08-03 20:04:36 +05:30
parent 8b6b924d09
commit ffa56a43cb
3830 changed files with 181529 additions and 495353 deletions

View File

@@ -39,27 +39,23 @@ class Dotenv
}
/**
* Load `.env` file in given directory.
* Load environment file in given directory.
*
* @return array
*/
public function load()
{
$this->loader = new Loader($this->filePath, true);
return $this->loader->load();
return $this->loadData();
}
/**
* Load `.env` file in given directory.
* Load environment file in given directory.
*
* @return array
*/
public function overload()
{
$this->loader = new Loader($this->filePath, false);
return $this->loader->load();
return $this->loadData(true);
}
/**
@@ -82,7 +78,21 @@ class Dotenv
}
/**
* Required ensures that the specified variables exist, and returns a new Validator object.
* Actually load the data.
*
* @param bool $overload
*
* @return array
*/
protected function loadData($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.
*
* @param string|string[] $variable
*