From 96dffbcf034fff50f54cc30a8bdee654b385efc9 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Wed, 20 May 2015 20:02:26 -0700
Subject: [PATCH] Do not derive from Singleton in Config (since the object is
now in DI).
---
core/CliMulti/RequestCommand.php | 1 -
core/Config.php | 2 +-
tests/PHPUnit/Integration/Tracker/ActionTest.php | 3 +--
tests/PHPUnit/Integration/TrackerTest.php | 5 -----
tests/PHPUnit/System/BlobReportLimitingTest.php | 2 --
tests/PHPUnit/Unit/AssetManagerTest.php | 2 --
tests/PHPUnit/Unit/Columns/DimensionTest.php | 8 --------
.../Unit/DataTable/Filter/PivotByDimensionTest.php | 3 ---
tests/PHPUnit/Unit/DataTable/MapTest.php | 1 -
tests/PHPUnit/Unit/IPTest.php | 2 --
tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php | 1 -
11 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index a0ceea795d..36c5b89c75 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 e04909b942..7971c5d47c 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 116dcb4ef7..c7bf5a9eca 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 68fbaa5370..7525a443ca 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 9785f31fd1..9ab1ef30e0 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 4108aeeb16..d4c8bab820 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 3855f1186a..c85408104f 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 fb66358ba1..97ee2e7100 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 d54691ddfa..3598b75f57 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 060fee5bac..2225144557 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 c13c95a940..ce053aee65 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();
--
GitLab