From d5f62dbdeb9f6502d40c742d021fa2400381f5ae Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 26 Aug 2014 11:21:11 +0200 Subject: refs #6065 remove tracker plugins from config and cache them instead in a file. Wondering which test will fail... --- tests/LocalTracker.php | 2 -- tests/PHPUnit/TestingEnvironment.php | 6 ------ 2 files changed, 8 deletions(-) (limited to 'tests') diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 366996b465..46243ef340 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -51,7 +51,6 @@ class Piwik_LocalTracker extends PiwikTracker // save some values $plugins = Config::getInstance()->Plugins['Plugins']; - $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; $oldTrackerConfig = Config::getInstance()->Tracker; \Piwik\Plugin\Manager::getInstance()->unloadPlugins(); @@ -85,7 +84,6 @@ class Piwik_LocalTracker extends PiwikTracker ob_end_clean(); // restore vars - Config::getInstance()->Plugins_Tracker['Plugins_Tracker'] = $pluginsTracker; Config::getInstance()->Tracker = $oldTrackerConfig; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = $oldLang; $_SERVER['HTTP_USER_AGENT'] = $oldUserAgent; diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php index c61ca8825b..be22cd2b9e 100644 --- a/tests/PHPUnit/TestingEnvironment.php +++ b/tests/PHPUnit/TestingEnvironment.php @@ -166,12 +166,6 @@ class Piwik_TestingEnvironment $local['Plugins'] = array('Plugins' => $pluginsToLoad); - $trackerPluginsToLoad = array_filter($local['Plugins']['Plugins'], function ($plugin) use ($manager) { - return $manager->isTrackerPlugin($manager->loadPlugin($plugin)); - }); - - $local['Plugins_Tracker'] = array('Plugins_Tracker' => $trackerPluginsToLoad); - $local['log']['log_writers'] = array('file'); $manager->unloadPlugins(); -- cgit v1.2.3