Use phpdotenv methods instead of getenv/putenv

laravel · Feb 14, 2015 · c7c85b1 · c7c85b1
1 parent 388aa6a
commit c7c85b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
@@ -16,6 +16,8 @@ public function bootstrap(Application $app)
 	{
 		try
 		{
+			Dotenv::makeMutable();
+
 			Dotenv::load($app['path.base'], $app->environmentFile());
 		}
 		catch (InvalidArgumentException $e)

diff --git a/src/Illuminate/Foundation/Testing/ApplicationTrait.php b/src/Illuminate/Foundation/Testing/ApplicationTrait.php
@@ -1,5 +1,6 @@
 <?php namespace Illuminate\Foundation\Testing;
 
+use Dotenv;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 
@@ -26,8 +27,8 @@ trait ApplicationTrait {
 	 */
 	protected function refreshApplication()
 	{
-		putenv('APP_ENV=testing');
-		
+		Dotenv::setEnvironmentVariable('APP_ENV', 'testing');
+
 		$this->app = $this->createApplication();
 	}
 

diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
@@ -559,9 +559,9 @@ function view($view = null, $data = array(), $mergeData = array())
 	 */
 	function env($key, $default = null)
 	{
-		$value = getenv($key);
+		$value = Dotenv::findEnvironmentVariable($key);
 
-		if ($value === false) return value($default);
+		if ($value === null) return value($default);
 
 		switch (strtolower($value))
 		{