Refs #4357 Not fully working, so reverting

matomo-org · Mar 3, 2014 · b647357 · b647357
1 parent f96c0f1
commit b647357
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 25 deletions.
diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
@@ -121,7 +121,7 @@ public function finalizeArchive()
     protected function getPluginArchivers()
     {
         if (empty(static::$archivers)) {
-            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
+            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedPlugins();
             $archivers = array();
             foreach ($pluginNames as $pluginName) {
                 $archivers[$pluginName] = self::getPluginArchiverClass($pluginName);

diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
@@ -64,7 +64,7 @@ public function postEvent($eventName, $params, $pending = false, $plugins = null
         }
 
         if (empty($plugins)) {
-            $plugins = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
+            $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
         }
 
         $callbacks = array();

diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
@@ -637,21 +637,9 @@ public function getLoadedPlugins()
      *
      * @return string[]
      */
-    public function getActivatedAndLoadedPlugins()
+    public function getActivatedPlugins()
     {
-        $activatedPlugins = $this->pluginsToLoad;
-
-        $plugins = array();
-        foreach ($activatedPlugins as $activatedPlugin) {
-
-            if ($activatedPlugin
-                && $this->isPluginLoaded($activatedPlugin)) {
-
-                $plugins[] = $activatedPlugin;
-            }
-        }
-
-        return $plugins;
+        return $this->pluginsToLoad;
     }
 
     /**

diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
@@ -55,7 +55,7 @@ protected function sendRequest($url, $method = 'GET', $data = null, $force = fal
         $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
         $oldTrackerConfig = Config::getInstance()->Tracker;
 
-        //\Piwik\Plugin\Manager::getInstance()->unloadPlugins();
+        \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
 
         // modify config
         $GLOBALS['PIWIK_TRACKER_MODE'] = true;

diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php
@@ -280,17 +280,17 @@ public function testRunTasks($expectedTimetable, $expectedExecutedTasks, $timeta
         $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
         $plugins = array_map(function ($p) { return $p->getPluginName(); }, $plugins);
 
-        // stub the piwik option object to control the returned option value
-        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
-        TaskScheduler::unsetInstance();
-
         \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
 
         // make sure the get tasks event returns our configured tasks
         \Piwik\Piwik::addAction(TaskScheduler::GET_TASKS_EVENT, function(&$tasks) use($configuredTasks) {
             $tasks = $configuredTasks;
         });
 
+        // stub the piwik option object to control the returned option value
+        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
+        TaskScheduler::unsetInstance();
+
         // execute tasks
         $executionResults = TaskScheduler::runTasks();
 

diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
@@ -48,6 +48,7 @@ public function setUp()
             Db::createDatabaseObject();
             DbHelper::createTables();
 
+//            \Piwik\Manager::getInstance()->loadPlugins(array());
             IntegrationTestCase::loadAllPlugins();
 
         } catch (Exception $e) {

diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -34,7 +34,7 @@ public function setUp()
 
         $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test");
 
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites'));
         \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
     }
 
@@ -47,7 +47,7 @@ public function setUp()
     public function testWarnUserViaSMSMultiSitesDeactivated()
     {
         // safety net
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging'));
         $this->assertFalse(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites'));
 
         $APIScheduledReports = APIScheduledReports::getInstance();

diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -34,7 +34,7 @@ public function setUp()
 
         // setup the access layer
         self::setSuperUser();
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging'));
         \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
 
         APISitesManager::getInstance()->addSite("Test", array("http://piwik.net"));
@@ -200,7 +200,7 @@ public function testDeleteReport()
     public function testGetTopMenuTranslationKeyMobileMessagingInactive()
     {
         // unload MobileMessaging plugin
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports'));
 
         $pdfReportPlugin = new ScheduledReports();
         $this->assertEquals(