Do not derive from Singleton in Config (since the object is now in DI).

matomo-org · May 24, 2015 · 96dffbc · 96dffbc
1 parent 38a51b0
commit 96dffbc
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 28 deletions.
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
@@ -49,7 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $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
@@ -38,7 +38,7 @@
  *     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
@@ -12,7 +12,6 @@
 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
@@ -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 @@ public function setUp()
     {
         parent::setUp();
 
-        Config::unsetInstance();
-
         Fixture::createWebsite('2014-01-01 00:00:00');
 
         $this->tracker = new TestTracker();
@@ -152,8 +149,6 @@ public function test_loadTrackerEnvironment_shouldNotThrow_whenConfigNotFound()
 
         $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
@@ -174,8 +174,6 @@ public static function getOutputPrefix()
 
     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
@@ -117,8 +117,6 @@ private function setUpConfig($filename)
         $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
@@ -67,20 +67,12 @@ public function setUp()
         {
             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
@@ -14,7 +14,6 @@
 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 @@ public function setUp()
         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
@@ -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
@@ -87,8 +87,6 @@ public function getIpFromHeaderTestData()
      */
     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
@@ -25,7 +25,6 @@ public function setUp()
     {
         parent::setUp();
 
-        Config::setSingletonInstance(new TestConfig());
         Config::getInstance()->Plugins['Plugins'] = array();
 
         $this->unloadAllPlugins();