Do not use static variables for config paths since they can now be specified upon construction.

1 files changed, 5 insertions, 11 deletions

diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 2332c068e4..23de01e8e2 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -85,17 +85,11 @@ class Piwik_TestingEnvironment
     {
         $testingEnvironment = new Piwik_TestingEnvironment();
 
-        if ($testingEnvironment->configFileLocal) {
-            \Piwik\Config::$defaultLocalConfigPath = $testingEnvironment->configFileLocal;
-        }
-
-        if ($testingEnvironment->configFileCommon) {
-            \Piwik\Config::$defaultCommonConfigPath = $testingEnvironment->configFileCommon;
-        }
-
-        if ($testingEnvironment->configFileGlobal) {
-            \Piwik\Config::$defaultGlobalConfigPath = $testingEnvironment->configFileGlobal;
-        }
+        Config::setSingletonInstance(new Config(
+            $testingEnvironment->configFileGlobal,
+            $testingEnvironment->configFileLocal,
+            $testingEnvironment->configFileCommon
+        ));
 
         if ($testingEnvironment->queryParamOverride) {
             foreach ($testingEnvironment->queryParamOverride as $key => $value) {