Merge pull request #7957 from piwik/test_env_di_3

Adding Config instance to DI and move all Config related test setup code from Config.php and TestingEnvironment.php to TestConfig class. Introduced completely internal EnvironmentManipulator concept so tests can change paths of local/global/common INI config file.

1 files changed, 0 insertions, 7 deletions

diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index f659eae71f..2591cdcdaa 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -124,7 +124,6 @@ class TestsSetupFixture extends ConsoleCommand
 
         // perform setup and/or teardown
         if ($input->getOption('teardown')) {
-            exit;
             $fixture->getTestEnvironment()->save();
             $fixture->performTearDown();
         } else {
@@ -225,12 +224,6 @@ class TestsSetupFixture extends ConsoleCommand
             $fixture->extraPluginsToLoad = explode(',', $extraPluginsToLoad);
         }
 
-        if ($fixture->createConfig) {
-            Config::getInstance()->setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSave);
-        }
-
-        $fixture->createConfig = false;
-
         return $fixture;
     }