diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index a0ceea795d29b9ee8979b0c8edb1102ff913b979..36c5b89c756161e3d8da3bd0cdd65848596c1aeb 100644
--- a/core/CliMulti/RequestCommand.php
+++ b/core/CliMulti/RequestCommand.php
@@ -49,7 +49,6 @@ class RequestCommand extends ConsoleCommand
$this->initHostAndQueryString($input);
if ($this->isTestModeEnabled()) {
- Config::setSingletonInstance(new TestConfig());
$indexFile = '/tests/PHPUnit/proxy/';
$this->resetDatabase();
diff --git a/core/Config.php b/core/Config.php
index e04909b94224a6fd187fc46c0abb2d1b894c6177..7971c5d47ca2ba80a87a6c7d534b5692fa9db849 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -38,7 +38,7 @@ use Piwik\Container\StaticContainer;
* Config::getInstance()->MySection = array('myoption' => 1);
* Config::getInstance()->forceSave();
*/
-class Config extends Singleton
+class Config
{
const DEFAULT_LOCAL_CONFIG_PATH = '/config/config.ini.php';
const DEFAULT_COMMON_CONFIG_PATH = '/config/common.config.ini.php';
diff --git a/tests/PHPUnit/Integration/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php
index 116dcb4ef70db0e20fef213586f68697db895e85..c7bf5a9eca0f87f95de57aa8bade1396425bd31a 100644
--- a/tests/PHPUnit/Integration/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php
@@ -12,7 +12,6 @@ use Piwik\Access;
use Piwik\Config;
use Piwik\Plugins\SitesManager\API;
use Piwik\Tests\Framework\Mock\FakeAccess;
-use Piwik\Tests\Framework\Mock\TestConfig;
use Piwik\Tracker\Action;
use Piwik\Tracker\PageUrl;
use Piwik\Tracker\Request;
@@ -29,7 +28,7 @@ class ActionTest extends IntegrationTestCase
public function setUp()
{
parent::setUp();
- Config::setSingletonInstance(new TestConfig());
+
$section = Config::getInstance()->Tracker;
$section['default_action_url'] = '/';
$section['campaign_var_name'] = 'campaign_param_name,piwik_campaign,utm_campaign,test_campaign_name';
diff --git a/tests/PHPUnit/Integration/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
index 68fbaa53708efd225e8f5ba4ee6c5ab945a57ca8..7525a443cac67dd7ee6c94aafcee48f160a224c4 100644
--- a/tests/PHPUnit/Integration/TrackerTest.php
+++ b/tests/PHPUnit/Integration/TrackerTest.php
@@ -8,7 +8,6 @@
namespace Piwik\Tests\Integration;
-use Piwik\Application\Kernel\GlobalSettingsProvider;
use Piwik\Common;
use Piwik\Config;
use Piwik\EventDispatcher;
@@ -59,8 +58,6 @@ class TrackerTest extends IntegrationTestCase
{
parent::setUp();
- Config::unsetInstance();
-
Fixture::createWebsite('2014-01-01 00:00:00');
$this->tracker = new TestTracker();
@@ -152,8 +149,6 @@ class TrackerTest extends IntegrationTestCase
$this->assertFalse(is_readable(Config::getInstance()->getLocalPath()));
- Config::unsetInstance();
-
Tracker::loadTrackerEnvironment();
$this->assertTrue(SettingsServer::isTrackerApiRequest());
diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index 9785f31fd1970e406aad3e3148ecbe11eb893422..9ab1ef30e005460bc651554e74de3c2ff3f66e35 100755
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -174,8 +174,6 @@ class BlobReportLimitingTest extends SystemTestCase
protected static function setUpConfigOptions()
{
- Config::setSingletonInstance(new TestConfig());
-
$generalConfig =& Config::getInstance()->General;
$generalConfig['datatable_archiving_maximum_rows_referers'] = 3;
$generalConfig['datatable_archiving_maximum_rows_subtable_referers'] = 2;
diff --git a/tests/PHPUnit/Unit/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php
index 4108aeeb16486634b5ae41969ac8037c051f568c..d4c8bab8209e0ae90fd4f08e9851f746511ab04c 100644
--- a/tests/PHPUnit/Unit/AssetManagerTest.php
+++ b/tests/PHPUnit/Unit/AssetManagerTest.php
@@ -117,8 +117,6 @@ class AssetManagerTest extends UnitTestCase
$userFile = PIWIK_INCLUDE_PATH . '/' . self::ASSET_MANAGER_TEST_DIR . 'configs/' . $filename;
$globalFile = PIWIK_INCLUDE_PATH . '/' . self::ASSET_MANAGER_TEST_DIR . 'configs/plugins.ini.php';
- Config::setSingletonInstance(new TestConfig($globalFile, $userFile));
-
$this->initEnvironment();
}
diff --git a/tests/PHPUnit/Unit/Columns/DimensionTest.php b/tests/PHPUnit/Unit/Columns/DimensionTest.php
index 3855f1186a398911c6ec3bb6a84c6989ffc3304f..c85408104ffc1911adb7f86489b1373c38868dd3 100644
--- a/tests/PHPUnit/Unit/Columns/DimensionTest.php
+++ b/tests/PHPUnit/Unit/Columns/DimensionTest.php
@@ -67,20 +67,12 @@ namespace Piwik\Tests\Unit\Columns
{
parent::setUp();
- Config::unsetInstance();
-
Manager::getInstance()->unloadPlugins();
Manager::getInstance()->doNotLoadAlwaysActivatedPlugins();
$this->dimension = new DimensionTest();
}
- public function tearDown()
- {
- Config::unsetInstance();
- parent::tearDown();
- }
-
public function test_hasImplementedEvent_shouldDetectWhetherAMethodWasOverwrittenInTheActualPluginClass()
{
$this->assertTrue($this->dimension->hasImplementedEvent('set'));
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
index fb66358ba1ec73cf3552ad1d2c18d5041befb559..97ee2e7100e462495d822e87aa3fffd06c6ae947 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
@@ -14,7 +14,6 @@ use Piwik\DataTable\Filter\PivotByDimension;
use Piwik\DataTable\Row;
use Piwik\Plugin\Manager as PluginManager;
use Exception;
-use Piwik\Tests\Framework\Mock\TestConfig;
use Piwik\Tests\Framework\TestCase\UnitTestCase;
/**
@@ -59,8 +58,6 @@ class PivotByDimensionTest extends UnitTestCase
Proxy::setSingletonInstance($proxyMock);
$this->segmentTableCount = 0;
-
- Config::setSingletonInstance(new TestConfig());
}
public function tearDown()
diff --git a/tests/PHPUnit/Unit/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
index d54691ddfa748943783bd298425c6727f047e343..3598b75f57e6128bca7b6775555c0943a6476793 100644
--- a/tests/PHPUnit/Unit/DataTable/MapTest.php
+++ b/tests/PHPUnit/Unit/DataTable/MapTest.php
@@ -16,7 +16,6 @@ class Test_DataTable_Map extends \PHPUnit_Framework_TestCase
public function setUp()
{
parent::setUp();
- Config::setSingletonInstance(new TestConfig());
Manager::getInstance()->deleteAll();
}
diff --git a/tests/PHPUnit/Unit/IPTest.php b/tests/PHPUnit/Unit/IPTest.php
index 060fee5bac17c59b78b0a2b42f946dd29ce35092..222514455772f9622e00939017d480cd2c7f29fb 100644
--- a/tests/PHPUnit/Unit/IPTest.php
+++ b/tests/PHPUnit/Unit/IPTest.php
@@ -87,8 +87,6 @@ class IPTest extends \PHPUnit_Framework_TestCase
*/
public function testGetIpFromHeader($description, $test)
{
- Config::setSingletonInstance(new TestConfig());
-
$_SERVER['REMOTE_ADDR'] = $test[0];
$_SERVER['HTTP_X_FORWARDED_FOR'] = $test[1];
Config::getInstance()->General['proxy_client_headers'] = array($test[2]);
diff --git a/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php b/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
index c13c95a9401b6298f745a222d6f2fa965cfa5921..ce053aee65dbe0b5928ae183b568b8f1727a1525 100644
--- a/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
+++ b/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
@@ -25,7 +25,6 @@ class ComponentFactoryTest extends PHPUnit_Framework_TestCase
{
parent::setUp();
- Config::setSingletonInstance(new TestConfig());
Config::getInstance()->Plugins['Plugins'] = array();
$this->unloadAllPlugins();