Fix testing again after environment change.

codeigniter4 · May 26, 2017 · e3f42e9 · e3f42e9
1 parent cd1c312
commit e3f42e9
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 116 deletions.
diff --git a/application/Config/Autoload.php b/application/Config/Autoload.php
@@ -52,7 +52,8 @@ public function __construct()
 		$psr4 = [
 			'Config'                     => APPPATH.'Config',
 			APP_NAMESPACE                => APPPATH,			// For custom namespace
-			'App'                        => APPPATH,			// To ensure filters, etc still found
+			'App'                        => APPPATH,			// To ensure filters, etc still found,
+			'Tests\Support'              => TESTPATH,           // So custom migrations can run during testing
 		];
 
 		/**

diff --git a/phpUxcOty b/phpUxcOty
@@ -0,0 +1 @@
+data
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
@@ -121,9 +121,9 @@ protected function setVariable(string $name, string $value = '')
 	{
 		list($name, $value) = $this->normaliseVariable($name, $value);
 
-		putenv("$name=$value");
-		$_ENV[$name]    = $value;
-		$_SERVER[$name] = $value;
+		if (! getenv($name, true)) putenv("$name=$value");
+		if (empty($_ENV[$name])) $_ENV[$name] = $value;
+		if (empty($_SERVER[$name])) $_SERVER[$name] = $value;
 	}
 
 	//--------------------------------------------------------------------