diff options
61 files changed, 134 insertions, 128 deletions
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php index 2a471fd388..055d60f207 100644 --- a/core/API/DocumentationGenerator.php +++ b/core/API/DocumentationGenerator.php @@ -14,7 +14,7 @@ use Exception; use Piwik\Common; use Piwik\Piwik; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Url; /** @@ -31,7 +31,7 @@ class DocumentationGenerator */ public function __construct() { - $plugins = PluginsManager::getInstance()->getLoadedPluginsName(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPluginsName(); foreach ($plugins as $plugin) { try { $className = Request::getClassNameAPI($plugin); diff --git a/core/API/Request.php b/core/API/Request.php index bf43170d0a..681f3866a4 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -16,7 +16,7 @@ use Piwik\Common; use Piwik\DataTable; use Piwik\Piwik; use Piwik\PluginDeactivatedException; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\SettingsServer; use Piwik\Url; use Piwik\UrlHelper; @@ -147,7 +147,7 @@ class Request list($module, $method) = $this->extractModuleAndMethod($moduleMethod); - if (!PluginsManager::getInstance()->isPluginActivated($module)) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated($module)) { throw new PluginDeactivatedException($module); } $apiClassName = $this->getClassNameAPI($module); diff --git a/core/Archive.php b/core/Archive.php index 5e09d1be2f..23b9a180c6 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -643,7 +643,7 @@ class Archive $plugin = substr($report, 0, strpos($report, '_')); if (empty($plugin) - || !\Piwik\PluginsManager::getInstance()->isPluginActivated($plugin) + || !\Piwik\Plugin\Manager::getInstance()->isPluginActivated($plugin) ) { $pluginStr = empty($plugin) ? '' : "($plugin)"; throw new \Exception("Error: The report '$report' was requested but it is not available " diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index db481096f3..2d9b9b5774 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -443,7 +443,7 @@ abstract class ArchiveProcessor if ($pluginBeingProcessed == $pluginName) { return true; } - if (!\Piwik\PluginsManager::getInstance()->isPluginLoaded($pluginBeingProcessed)) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginLoaded($pluginBeingProcessed)) { return true; } return false; diff --git a/core/AssetManager.php b/core/AssetManager.php index 4f5173b578..d95baa5f90 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -110,7 +110,7 @@ class AssetManager */ public static function generateAssetsCacheBuster() { - $pluginList = md5(implode(",", PluginsManager::getInstance()->getLoadedPluginsName())); + $pluginList = md5(implode(",", \Piwik\Plugin\Manager::getInstance()->getLoadedPluginsName())); $cacheBuster = md5(SettingsPiwik::getSalt() . $pluginList . PHP_VERSION . Version::VERSION); return $cacheBuster; } @@ -305,8 +305,8 @@ class AssetManager $stylesheets = self::sortCssFiles($stylesheets); // We look for the currently enabled theme and add CSS from the json - $theme = PluginsManager::getInstance()->getThemeEnabled(); - if ($theme && $theme->getPluginName() != PluginsManager::DEFAULT_THEME) { + $theme = \Piwik\Plugin\Manager::getInstance()->getThemeEnabled(); + if ($theme && $theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME) { $info = $theme->getInformation(); if (isset($info['stylesheet'])) { $themeStylesheetFile = 'plugins/' . $theme->getPluginName() . '/' . $info['stylesheet']; diff --git a/core/Common.php b/core/Common.php index 5586b82f0a..8b5409469c 100644 --- a/core/Common.php +++ b/core/Common.php @@ -114,7 +114,7 @@ class Common */ public static function isGoalPluginEnabled() { - return PluginsManager::getInstance()->isPluginActivated('Goals'); + return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('Goals'); } /** diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php index 6f3556a11c..66cef418ef 100644 --- a/core/EventDispatcher.php +++ b/core/EventDispatcher.php @@ -80,7 +80,7 @@ class EventDispatcher } if (empty($plugins)) { - $plugins = PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins(); } $callbacks = array(); @@ -88,7 +88,7 @@ class EventDispatcher // collect all callbacks to execute foreach ($plugins as $plugin) { if (is_string($plugin)) { - $plugin = PluginsManager::getInstance()->getLoadedPlugin($plugin); + $plugin = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugin($plugin); } $hooks = $plugin->getListHooksRegistered(); diff --git a/core/FrontController.php b/core/FrontController.php index d7b98dc63b..f93a607ee9 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -63,7 +63,7 @@ class FrontController throw new Exception("Invalid module name '$module'"); } - if (!PluginsManager::getInstance()->isPluginActivated($module)) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated($module)) { throw new PluginDeactivatedException($module); } @@ -297,7 +297,7 @@ class FrontController $this->handleMaintenanceMode(); $this->handleSSLRedirection(); - $pluginsManager = PluginsManager::getInstance(); + $pluginsManager = \Piwik\Plugin\Manager::getInstance(); $pluginsToLoad = Config::getInstance()->Plugins['Plugins']; $pluginsManager->loadPlugins($pluginsToLoad); @@ -332,7 +332,7 @@ class FrontController */ Piwik::postEvent('Request.dispatchCoreAndPluginUpdatesScreen'); - PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); // ensure the current Piwik URL is known for later use if (method_exists('Piwik\SettingsPiwik', 'getPiwikUrl')) { diff --git a/core/Piwik.php b/core/Piwik.php index 9d5a551a0c..c5452c444e 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -461,7 +461,7 @@ class Piwik */ static public function getCurrentPlugin() { - return \Piwik\PluginsManager::getInstance()->getLoadedPlugin(Piwik::getModule()); + return \Piwik\Plugin\Manager::getInstance()->getLoadedPlugin(Piwik::getModule()); } /** diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php index 31bc629f36..4cc3026ac1 100644 --- a/core/Plugin/ControllerAdmin.php +++ b/core/Plugin/ControllerAdmin.php @@ -14,7 +14,7 @@ use Piwik\Config; use Piwik\Menu\MenuAdmin; use Piwik\Menu\MenuTop; use Piwik\Piwik; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Url; use Piwik\Version; use Piwik\View; @@ -64,10 +64,10 @@ abstract class ControllerAdmin extends Controller $view->isSuperUser = Piwik::isUserIsSuperUser(); // for old geoip plugin warning - $view->usingOldGeoIPPlugin = PluginsManager::getInstance()->isPluginActivated('GeoIP'); + $view->usingOldGeoIPPlugin = \Piwik\Plugin\Manager::getInstance()->isPluginActivated('GeoIP'); // for cannot find installed plugin warning - $missingPlugins = PluginsManager::getInstance()->getMissingPlugins(); + $missingPlugins = \Piwik\Plugin\Manager::getInstance()->getMissingPlugins(); if (!empty($missingPlugins)) { $pluginsLink = Url::getCurrentQueryStringWithParametersModified(array( 'module' => 'CorePluginsAdmin', 'action' => 'plugins' diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 9392d9d6cf..d7add95fdb 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -11,7 +11,13 @@ namespace Piwik\Plugin; +use Piwik\Config; +use Piwik\EventDispatcher; +use Piwik\Filesystem; +use Piwik\Option; +use Piwik\Plugin; use Piwik\Translate; +use Piwik\Updater; require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; @@ -669,14 +675,14 @@ class Manager * Install a specific plugin * * @param Plugin $plugin - * @throws PluginsManager_PluginException if installation fails + * @throws \Piwik\Plugin\Manager_PluginException if installation fails */ private function installPlugin(Plugin $plugin) { try { $plugin->install(); } catch (\Exception $e) { - throw new PluginsManager_PluginException($plugin->getPluginName(), $e->getMessage()); + throw new \Piwik\Plugin\PluginException($plugin->getPluginName(), $e->getMessage()); } Updater::recordComponentSuccessfullyUpdated($plugin->getPluginName(), $plugin->getVersion()); } @@ -874,7 +880,7 @@ class Manager * @package Piwik * @subpackage Manager */ -class PluginsManager_PluginException extends \Exception +class PluginException extends \Exception { function __construct($pluginName, $message) { diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index fc9e6808a6..3cb55a89c6 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -13,7 +13,7 @@ namespace Piwik\Plugin; use Exception; use Piwik\Common; use Piwik\Piwik; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Version; /** @@ -83,7 +83,7 @@ class MetadataLoader private function loadPluginInfoJson() { - $path = PluginsManager::getPluginsDirectory() . $this->pluginName . '/' . self::PLUGIN_JSON_FILENAME; + $path = \Piwik\Plugin\Manager::getPluginsDirectory() . $this->pluginName . '/' . self::PLUGIN_JSON_FILENAME; return $this->loadJsonMetadata($path); } diff --git a/core/Tracker.php b/core/Tracker.php index 9071f00835..f4618ee3b3 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -403,7 +403,7 @@ class Tracker Db::createDatabaseObject(); } - $pluginsManager = PluginsManager::getInstance(); + $pluginsManager = \Piwik\Plugin\Manager::getInstance(); $pluginsToLoad = Config::getInstance()->Plugins['Plugins']; $pluginsForcedNotToLoad = Tracker::getPluginsNotToLoad(); $pluginsToLoad = array_diff($pluginsToLoad, $pluginsForcedNotToLoad); @@ -672,9 +672,9 @@ class Tracker $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; if (count($pluginsTracker) > 0) { $pluginsTracker = array_diff($pluginsTracker, self::getPluginsNotToLoad()); - PluginsManager::getInstance()->doNotLoadAlwaysActivatedPlugins(); + \Piwik\Plugin\Manager::getInstance()->doNotLoadAlwaysActivatedPlugins(); - PluginsManager::getInstance()->loadPlugins($pluginsTracker); + \Piwik\Plugin\Manager::getInstance()->loadPlugins($pluginsTracker); Common::printDebug("Loading plugins: { " . implode(",", $pluginsTracker) . " }"); } diff --git a/core/Translate.php b/core/Translate.php index 09bd650edc..f7e9808ad8 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -49,7 +49,7 @@ class Translate self::unloadEnglishTranslation(); self::loadEnglishTranslation(); self::loadCoreTranslation($language); - PluginsManager::getInstance()->loadPluginTranslations($language); + \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations($language); } /** @@ -114,17 +114,17 @@ class Translate } /** Reset the cached language to load. Used in tests. */ - static public function reset() + public static function reset() { self::$languageToLoad = null; } - public function getLanguageLoaded() + public static function getLanguageLoaded() { return self::$loadedLanguage; } - public function getLanguageDefault() + public static function getLanguageDefault() { return Config::getInstance()->General['default_language']; } @@ -132,7 +132,7 @@ class Translate /** * Generate javascript translations array */ - public function getJavascriptTranslations() + public static function getJavascriptTranslations() { $translations = & $GLOBALS['Piwik_translations']; @@ -155,7 +155,7 @@ class Translate * Returns the list of client side translations by key. These translations will be outputted * to the translation JavaScript. */ - private function getClientSideTranslationKeys() + private static function getClientSideTranslationKeys() { $result = array(); diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php index 06d77df7d7..9ff96b2bc3 100644 --- a/core/Translate/Writer.php +++ b/core/Translate/Writer.php @@ -14,7 +14,7 @@ namespace Piwik\Translate; use Exception; use Piwik\Filesystem; use Piwik\Piwik; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Translate\Filter\FilterAbstract; use Piwik\Translate\Validate\ValidateAbstract; @@ -93,7 +93,7 @@ class Writer $this->setLanguage($language); if (!empty($pluginName)) { - $installedPlugins = PluginsManager::getInstance()->readPluginsDirectory(); + $installedPlugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory(); if (!in_array($pluginName, $installedPlugins)) { diff --git a/core/Twig.php b/core/Twig.php index 369bdf6527..55fe74d011 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -78,7 +78,7 @@ class Twig { $getJavascriptTranslations = new Twig_SimpleFunction( 'getJavascriptTranslations', - array(Translate::getInstance(), 'getJavascriptTranslations') + array('Translate', 'getJavascriptTranslations') ); $this->twig->addFunction($getJavascriptTranslations); } @@ -86,7 +86,7 @@ class Twig protected function addFunction_isPluginLoaded() { $isPluginLoadedFunction = new Twig_SimpleFunction('isPluginLoaded', function ($pluginName) { - return PluginsManager::getInstance()->isPluginLoaded($pluginName); + return \Piwik\Plugin\Manager::getInstance()->isPluginLoaded($pluginName); }); $this->twig->addFunction($isPluginLoadedFunction); } @@ -145,7 +145,7 @@ class Twig private function getDefaultThemeLoader() { $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, PluginsManager::DEFAULT_THEME) + sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\Plugin\Manager::DEFAULT_THEME) )); return $themeLoader; @@ -222,7 +222,7 @@ class Twig private function addPluginNamespaces(Twig_Loader_Filesystem $loader) { - $plugins = PluginsManager::getInstance()->getLoadedPluginsName(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPluginsName(); foreach ($plugins as $name) { $path = sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, $name); if (is_dir($path)) { diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php index 51826517f8..56643eca86 100644 --- a/core/Updates/0.6-rc1.php +++ b/core/Updates/0.6-rc1.php @@ -50,8 +50,8 @@ class Updates_0_6_rc1 extends Updates ); $disabledPlugins = array(); foreach ($pluginsToDisableMessage as $pluginToDisable => $warningMessage) { - if (\Piwik\PluginsManager::getInstance()->isPluginActivated($pluginToDisable)) { - \Piwik\PluginsManager::getInstance()->deactivatePlugin($pluginToDisable); + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginToDisable)) { + \Piwik\Plugin\Manager::getInstance()->deactivatePlugin($pluginToDisable); $disabledPlugins[] = $warningMessage; } } diff --git a/core/Updates/1.10-b4.php b/core/Updates/1.10-b4.php index 8627bba983..84cea81d03 100755 --- a/core/Updates/1.10-b4.php +++ b/core/Updates/1.10-b4.php @@ -26,7 +26,7 @@ class Updates_1_10_b4 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('MobileMessaging'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('MobileMessaging'); } catch (\Exception $e) { // pass } diff --git a/core/Updates/1.10.1.php b/core/Updates/1.10.1.php index 453773a5a0..34ce7d33ff 100755 --- a/core/Updates/1.10.1.php +++ b/core/Updates/1.10.1.php @@ -26,7 +26,7 @@ class Updates_1_10_1 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('Overlay'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('Overlay'); } catch (\Exception $e) { // pass } diff --git a/core/Updates/1.11-b1.php b/core/Updates/1.11-b1.php index 19e2708b1f..22db92812c 100644 --- a/core/Updates/1.11-b1.php +++ b/core/Updates/1.11-b1.php @@ -26,7 +26,7 @@ class Updates_1_11_b1 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('UserCountryMap'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('UserCountryMap'); } catch (\Exception $e) { // pass } diff --git a/core/Updates/1.12-b15.php b/core/Updates/1.12-b15.php index 68d122385c..300117d404 100644 --- a/core/Updates/1.12-b15.php +++ b/core/Updates/1.12-b15.php @@ -21,7 +21,7 @@ class Updates_1_12_b15 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('SegmentEditor'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('SegmentEditor'); } catch (\Exception $e) { // pass } diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php index 0536fd72a5..32637943f8 100644 --- a/core/Updates/1.2-rc1.php +++ b/core/Updates/1.2-rc1.php @@ -127,8 +127,8 @@ class Updates_1_2_rc1 extends Updates ); $disabledPlugins = array(); foreach ($pluginsToDisableMessage as $pluginToDisable => $warningMessage) { - if (\Piwik\PluginsManager::getInstance()->isPluginActivated($pluginToDisable)) { - \Piwik\PluginsManager::getInstance()->deactivatePlugin($pluginToDisable); + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginToDisable)) { + \Piwik\Plugin\Manager::getInstance()->deactivatePlugin($pluginToDisable); $disabledPlugins[] = $warningMessage; } } diff --git a/core/Updates/1.2-rc2.php b/core/Updates/1.2-rc2.php index 6d2373c3c9..3223e7f145 100644 --- a/core/Updates/1.2-rc2.php +++ b/core/Updates/1.2-rc2.php @@ -21,7 +21,7 @@ class Updates_1_2_rc2 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('CustomVariables'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('CustomVariables'); } catch (\Exception $e) { } } diff --git a/core/Updates/1.5-rc6.php b/core/Updates/1.5-rc6.php index 0bf8abe3c4..c7aa715b4c 100644 --- a/core/Updates/1.5-rc6.php +++ b/core/Updates/1.5-rc6.php @@ -21,7 +21,7 @@ class Updates_1_5_rc6 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('PrivacyManager'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('PrivacyManager'); } catch (\Exception $e) { } } diff --git a/core/Updates/1.6-rc1.php b/core/Updates/1.6-rc1.php index 5259cc64b3..dc0e347a10 100644 --- a/core/Updates/1.6-rc1.php +++ b/core/Updates/1.6-rc1.php @@ -21,7 +21,7 @@ class Updates_1_6_rc1 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('ImageGraph'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('ImageGraph'); } catch (\Exception $e) { } } diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php index 654a53c6d3..d5efe3f8dd 100644 --- a/core/Updates/1.8.3-b1.php +++ b/core/Updates/1.8.3-b1.php @@ -50,7 +50,7 @@ class Updates_1_8_3_b1 extends Updates static function update() { Updater::updateDatabase(__FILE__, self::getSql()); - if (!\Piwik\PluginsManager::getInstance()->isPluginLoaded('ScheduledReports')) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginLoaded('ScheduledReports')) { return; } diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php index 904f75a757..01630c9730 100755 --- a/core/Updates/1.9-b19.php +++ b/core/Updates/1.9-b19.php @@ -38,7 +38,7 @@ class Updates_1_9_b19 extends Updates try { - \Piwik\PluginsManager::getInstance()->activatePlugin('Transitions'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('Transitions'); } catch (\Exception $e) { } } diff --git a/core/Updates/1.9.3-b10.php b/core/Updates/1.9.3-b10.php index 154313105d..dab644b94a 100755 --- a/core/Updates/1.9.3-b10.php +++ b/core/Updates/1.9.3-b10.php @@ -26,7 +26,7 @@ class Updates_1_9_3_b10 extends Updates static function update() { try { - \Piwik\PluginsManager::getInstance()->activatePlugin('Annotations'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('Annotations'); } catch (\Exception $e) { // pass } diff --git a/core/Updates/1.9.3-b3.php b/core/Updates/1.9.3-b3.php index 149af3bd0b..94570af301 100644 --- a/core/Updates/1.9.3-b3.php +++ b/core/Updates/1.9.3-b3.php @@ -23,9 +23,9 @@ class Updates_1_9_3_b3 extends Updates // Insight was a temporary code name for Overlay $pluginToDelete = 'Insight'; self::deletePluginFromConfigFile($pluginToDelete); - \Piwik\PluginsManager::getInstance()->deletePluginFromFilesystem($pluginToDelete); + \Piwik\Plugin\Manager::getInstance()->deletePluginFromFilesystem($pluginToDelete); // We also clean up 1.9.1 and delete Feedburner plugin - \Piwik\PluginsManager::getInstance()->deletePluginFromFilesystem('Feedburner'); + \Piwik\Plugin\Manager::getInstance()->deletePluginFromFilesystem('Feedburner'); } } diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php index 1e4c0145f4..878eb15bdd 100644 --- a/core/Updates/2.0-a13.php +++ b/core/Updates/2.0-a13.php @@ -68,11 +68,11 @@ class Updates_2_0_a13 extends Updates try { - \Piwik\PluginsManager::getInstance()->activatePlugin('Referrers'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('Referrers'); } catch (\Exception $e) { } try { - \Piwik\PluginsManager::getInstance()->activatePlugin('ScheduledReports'); + \Piwik\Plugin\Manager::getInstance()->activatePlugin('ScheduledReports'); } catch (\Exception $e) { } diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index b8a2d8616f..250fc81bec 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -1007,7 +1007,7 @@ class ViewDataTable $reportYear = $reportDate->toString('Y'); $reportMonth = $reportDate->toString('m'); - if (PluginsManager::getInstance()->isPluginActivated('PrivacyManager') + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('PrivacyManager') && Plugins\PrivacyManager\PrivacyManager::shouldReportBePurged($reportYear, $reportMonth) ) { return true; @@ -1085,7 +1085,7 @@ class ViewDataTable protected function overrideViewProperties() { - if (!PluginsManager::getInstance()->isPluginActivated('Goals')) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Goals')) { $this->viewProperties['show_goals'] = false; } diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 97398fee58..030a7fe6b9 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -619,7 +619,7 @@ class Actions extends \Piwik\Plugin static protected function isCustomVariablesPluginsEnabled() { - return \Piwik\PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables'); } /** diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index d979c9384f..e1c67690e8 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -54,7 +54,7 @@ class Controller extends \Piwik\Plugin\Controller $view->noResultKeywords = $this->getSiteSearchNoResultKeywords(true); $view->pagesUrlsFollowingSiteSearch = $this->getPageUrlsFollowingSiteSearch(true); - $categoryTrackingEnabled = \Piwik\PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + $categoryTrackingEnabled = \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables'); if ($categoryTrackingEnabled) { $view->categories = $this->getSiteSearchCategories(true); } diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index c2e1be90d5..15b0ba1ef1 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -45,7 +45,7 @@ class Controller extends \Piwik\Plugin\Controller // User preference: default report to load is the All Websites dashboard if ($defaultReport == 'MultiSites' - && \Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites') + && \Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites') ) { $module = 'MultiSites'; } diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index b33700f9f3..b3cb7ce9ff 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -16,7 +16,7 @@ use Piwik\Filesystem; use Piwik\Nonce; use Piwik\Piwik; use Piwik\Plugin; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Url; use Piwik\View; @@ -106,7 +106,7 @@ class Controller extends Plugin\ControllerAdmin 'name' => $pluginMetadata->name, 'version' => $pluginMetadata->version, 'isTheme' => !empty($pluginMetadata->theme), - 'isActivated' => PluginsManager::getInstance()->isPluginActivated($pluginMetadata->name) + 'isActivated' => \Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginMetadata->name) ); echo $view->render(); @@ -194,7 +194,7 @@ class Controller extends Plugin\ControllerAdmin $users = \Piwik\Plugins\UsersManager\API::getInstance()->getUsers(); $view->otherUsersCount = count($users) - 1; - $view->themeEnabled = PluginsManager::getInstance()->getThemeEnabled()->getPluginName(); + $view->themeEnabled = \Piwik\Plugin\Manager::getInstance()->getThemeEnabled()->getPluginName(); $marketplace = new Marketplace(); $view->pluginsHavingUpdate = $marketplace->getPluginsHavingUpdate($themesOnly); @@ -229,7 +229,7 @@ class Controller extends Plugin\ControllerAdmin protected function getPluginsInfo($themesOnly = false) { - $plugins = PluginsManager::getInstance()->returnLoadedPluginsInfo(); + $plugins = \Piwik\Plugin\Manager::getInstance()->returnLoadedPluginsInfo(); foreach ($plugins as $pluginName => &$plugin) { if (!isset($plugin['info'])) { @@ -271,7 +271,7 @@ class Controller extends Plugin\ControllerAdmin public function deactivate($redirectAfter = true) { $pluginName = $this->initPluginModification(static::DEACTIVATE_NONCE); - \Piwik\PluginsManager::getInstance()->deactivatePlugin($pluginName); + \Piwik\Plugin\Manager::getInstance()->deactivatePlugin($pluginName); $this->redirectAfterModification($redirectAfter); } @@ -302,11 +302,11 @@ class Controller extends Plugin\ControllerAdmin { $pluginName = $this->initPluginModification(static::ACTIVATE_NONCE); - \Piwik\PluginsManager::getInstance()->activatePlugin($pluginName); + \Piwik\Plugin\Manager::getInstance()->activatePlugin($pluginName); if ($redirectAfter) { $params = array('activated' => 1, 'pluginName' => $pluginName); - $plugin = PluginsManager::getInstance()->loadPlugin($pluginName); + $plugin = \Piwik\Plugin\Manager::getInstance()->loadPlugin($pluginName); $actionToRedirect = 'plugins'; if ($plugin->isTheme()) { @@ -321,7 +321,7 @@ class Controller extends Plugin\ControllerAdmin { $pluginName = $this->initPluginModification(static::UNINSTALL_NONCE); - $uninstalled = \Piwik\PluginsManager::getInstance()->uninstallPlugin($pluginName); + $uninstalled = \Piwik\Plugin\Manager::getInstance()->uninstallPlugin($pluginName); if (!$uninstalled) { $path = Filesystem::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/'; diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php index 024a1e519f..5a068f176d 100644 --- a/plugins/CorePluginsAdmin/Marketplace.php +++ b/plugins/CorePluginsAdmin/Marketplace.php @@ -12,7 +12,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Piwik\Date; use Piwik\Piwik; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; /** * @@ -49,7 +49,7 @@ class Marketplace foreach ($plugins as &$plugin) { $plugin['canBeUpdated'] = $this->hasPluginUpdate($plugin); - $plugin['isInstalled'] = PluginsManager::getInstance()->isPluginLoaded($plugin['name']); + $plugin['isInstalled'] = \Piwik\Plugin\Manager::getInstance()->isPluginLoaded($plugin['name']); $plugin['lastUpdated'] = Date::factory($plugin['lastUpdated'])->getLocalized($dateFormat); } @@ -79,7 +79,7 @@ class Marketplace */ public function getPluginsHavingUpdate($themesOnly) { - $pluginManager = PluginsManager::getInstance(); + $pluginManager = \Piwik\Plugin\Manager::getInstance(); $pluginManager->returnLoadedPluginsInfo(); $loadedPlugins = $pluginManager->getLoadedPlugins(); diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php index a8049b681d..1ac4b40f10 100644 --- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php +++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php @@ -12,7 +12,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Piwik\CacheFile; use Piwik\Http; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Version; /** @@ -72,7 +72,7 @@ class MarketplaceApiClient foreach ($plugins as $plugin) { $pluginName = $plugin->getPluginName(); - if (!PluginsManager::getInstance()->isPluginBundledWithCore($pluginName)) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginBundledWithCore($pluginName)) { $params[] = array('name' => $plugin->getPluginName(), 'version' => $plugin->getVersion()); } } diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index bb580ee8f0..d6ac72dbaf 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -371,7 +371,7 @@ class Controller extends \Piwik\Plugin\Controller $this->coreError = true; break; } else { - \Piwik\PluginsManager::getInstance()->deactivatePlugin($name); + \Piwik\Plugin\Manager::getInstance()->deactivatePlugin($name); $this->deactivatedPlugins[] = $name; } } diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 5bbfc2e9d9..ba3c3f6ffd 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -40,7 +40,7 @@ class CoreUpdater extends \Piwik\Plugin public static function getComponentUpdates(Updater $updater) { $updater->addComponentToCheck('core', Version::VERSION); - $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins(); foreach ($plugins as $pluginName => $plugin) { $updater->addComponentToCheck($pluginName, $plugin->getVersion()); } diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 1cc9fcdc28..a17b9a8dfa 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -332,7 +332,7 @@ class Archiver extends \Piwik\Plugin\Archiver } $label = "Value not defined"; // Product Name/Category not defined" - if (PluginsManager::getInstance()->isPluginActivated('CustomVariables')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) { $label = \Piwik\Plugins\CustomVariables\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED; } } diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 17edce163d..ad1ebee7cc 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -86,7 +86,7 @@ class Controller extends \Piwik\Plugin\Controller public function ecommerceReport() { - if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('CustomVariables')) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) { throw new Exception("Ecommerce Tracking requires that the plugin Custom Variables is enabled. Please enable the plugin CustomVariables (or ask your admin)."); } @@ -304,14 +304,14 @@ class Controller extends \Piwik\Plugin\Controller $topDimensionsToLoad = array(); - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('UserCountry')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('UserCountry')) { $topDimensionsToLoad += array( 'country' => 'UserCountry.getCountry', ); } $keywordNotDefinedString = ''; - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Referrers')) { $keywordNotDefinedString = APIReferrers::getKeywordNotDefinedString(); $topDimensionsToLoad += array( 'keyword' => 'Referrers.getKeywords', diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index e72cfe7456..05740915f4 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -16,7 +16,7 @@ use Piwik\Config; use Piwik\MetricsFormatter; use Piwik\Piwik; use Piwik\Plugins\Goals\API as APIGoals; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Url; use Piwik\View; use Piwik\ViewDataTable; @@ -151,7 +151,7 @@ class Controller extends \Piwik\Plugin\Controller if (Common::getRequestVar('showMap', 1) == 1 && $view->visitorData['hasLatLong'] - && PluginsManager::getInstance()->isPluginLoaded('UserCountryMap') + && \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('UserCountryMap') ) { $view->userCountryMapUrl = $this->getUserCountryMapUrlForVisitorProfile(); } @@ -211,7 +211,7 @@ class Controller extends \Piwik\Plugin\Controller private function setWidgetizedVisitorProfileUrl($view) { - if (PluginsManager::getInstance()->isPluginLoaded('Widgetize')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginLoaded('Widgetize')) { $view->widgetizedLink = Url::getCurrentQueryStringWithParametersModified(array( 'module' => 'Widgetize', 'action' => 'iframe', diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 10aa1bbf80..116ad8f761 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -351,7 +351,7 @@ class Visitor function getKeyword() { $keyword = $this->details['referer_keyword']; - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers') + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Referrers') && $this->getReferrerType() == 'search' ) { $keyword = \Piwik\Plugins\Referrers\API::getCleanKeyword($keyword); @@ -362,7 +362,7 @@ class Visitor function getReferrerUrl() { if ($this->getReferrerType() == 'search') { - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers') + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Referrers') && $this->details['referer_keyword'] == APIReferrers::LABEL_KEYWORD_NOT_DEFINED ) { return 'http://piwik.org/faq/general/#faq_144'; @@ -520,7 +520,7 @@ class Visitor function getDeviceType() { - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('DevicesDetection')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('DevicesDetection')) { return \Piwik\Plugins\DevicesDetection\getDeviceTypeLabel($this->details['config_device_type']); } return false; diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 9e9b92d4f0..e138c28951 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -168,7 +168,7 @@ class MobileMessaging extends \Piwik\Plugin public function getRendererInstance(&$reportRenderer, $info) { if (self::manageEvent($info)) { - if (\Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites')) { + if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites')) { $reportRenderer = new Sms(); } else { $reportRenderer = new ReportRendererException( diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 90620ac536..e23d025340 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -115,7 +115,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin */ public static function isDntSupported() { - return \Piwik\PluginsManager::getInstance()->isPluginActivated('DoNotTrack'); + return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('DoNotTrack'); } public function privacySettings() @@ -225,12 +225,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Piwik::checkUserIsSuperUser(); $anonymizeIP = array(); - \Piwik\PluginsManager::getInstance()->loadPlugin(self::ANONYMIZE_IP_PLUGIN_NAME); + \Piwik\Plugin\Manager::getInstance()->loadPlugin(self::ANONYMIZE_IP_PLUGIN_NAME); $anonymizeIP["name"] = self::ANONYMIZE_IP_PLUGIN_NAME; - $anonymizeIP["enabled"] = \Piwik\PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME); + $anonymizeIP["enabled"] = \Piwik\Plugin\Manager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME); $anonymizeIP["maskLength"] = Config::getInstance()->Tracker['ip_address_mask_length']; - $anonymizeIP["info"] = \Piwik\PluginsManager::getInstance()->getLoadedPlugin(self::ANONYMIZE_IP_PLUGIN_NAME)->getInformation(); + $anonymizeIP["info"] = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugin(self::ANONYMIZE_IP_PLUGIN_NAME)->getInformation(); return $anonymizeIP; } @@ -287,9 +287,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin { $pluginController = new \Piwik\Plugins\CorePluginsAdmin\Controller(); - if ($state == 1 && !\Piwik\PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { + if ($state == 1 && !\Piwik\Plugin\Manager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { $pluginController->activate($redirectAfter = false); - } elseif ($state == 0 && \Piwik\PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { + } elseif ($state == 0 && \Piwik\Plugin\Manager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { $pluginController->deactivate($redirectAfter = false); } else { //nothing to do diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index 98de8bd5e0..5b4126a768 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -158,7 +158,7 @@ class PrivacyManager extends \Piwik\Plugin */ public static function savePurgeDataSettings($settings) { - $plugin = \Piwik\PluginsManager::getInstance()->getLoadedPlugin('PrivacyManager'); + $plugin = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugin('PrivacyManager'); foreach (self::$defaultPurgeDataOptions as $optionName => $defaultValue) { if (isset($settings[$optionName])) { diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index 36fae6c631..4feb8dfcb5 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -817,6 +817,6 @@ class API */ public static function isSegmentEditorActivated() { - return \Piwik\PluginsManager::getInstance()->isPluginActivated('SegmentEditor'); + return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('SegmentEditor'); } } diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index f59f6a4dbe..817bb7edd7 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -221,7 +221,7 @@ class ScheduledReports extends \Piwik\Plugin : $displayFormat != self::DISPLAY_FORMAT_TABLES_ONLY) && \Piwik\SettingsServer::isGdExtensionEnabled() - && \Piwik\PluginsManager::getInstance()->isPluginActivated('ImageGraph') + && \Piwik\Plugin\Manager::getInstance()->isPluginActivated('ImageGraph') && !empty($metadata['imageGraphUrl']); $processedReport['evolutionGraph'] = $evolutionGraph; @@ -478,7 +478,7 @@ class ScheduledReports extends \Piwik\Plugin 13, $isHTML = false, $tooltip = Piwik::translate( - \Piwik\PluginsManager::getInstance()->isPluginActivated('MobileMessaging') + \Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging') ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip' ) ); @@ -487,7 +487,7 @@ class ScheduledReports extends \Piwik\Plugin function getTopMenuTranslationKey() { // if MobileMessaging is not activated, display 'Email reports' - if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('MobileMessaging')) + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging')) return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; if (Piwik::isUserIsAnonymous()) { diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index c10b09a88d..91d8688f91 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -73,7 +73,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $view->globalSearchKeywordParameters = API::getInstance()->getSearchKeywordParametersGlobal(); $view->globalSearchCategoryParameters = API::getInstance()->getSearchCategoryParametersGlobal(); - $view->isSearchCategoryTrackingEnabled = \Piwik\PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + $view->isSearchCategoryTrackingEnabled = \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables'); $view->allowSiteSpecificUserAgentExclude = API::getInstance()->isSiteSpecificUserAgentExcludeEnabled(); diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 8f3c227beb..235370d12f 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -216,7 +216,7 @@ class Controller extends \Piwik\Plugin\Controller private function checkUserCountryPluginEnabled() { - if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('UserCountry')) { + if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('UserCountry')) { throw new Exception(Piwik::translate('General_Required', 'Plugin UserCountry')); } } diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 3a7463ece2..68de0172a4 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -55,7 +55,7 @@ class Piwik_LocalTracker extends PiwikTracker $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; $oldTrackerConfig = Config::getInstance()->Tracker; - \Piwik\PluginsManager::getInstance()->unloadPlugins(); + \Piwik\Plugin\Manager::getInstance()->unloadPlugins(); // modify config $GLOBALS['PIWIK_TRACKER_MODE'] = true; @@ -96,7 +96,7 @@ class Piwik_LocalTracker extends PiwikTracker unset($_GET['bots']); // reload plugins - \Piwik\PluginsManager::getInstance()->loadPlugins($plugins); + \Piwik\Plugin\Manager::getInstance()->loadPlugins($plugins); return $output; } diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index 18c0996529..b771669ef9 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -282,10 +282,10 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase public function testRunTasks($expectedTimetable, $expectedExecutedTasks, $timetableBeforeTaskExecution, $configuredTasks) { // temporarily unload plugins - $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins(); $plugins = array_map(function ($p) { return $p->getPluginName(); }, $plugins); - \Piwik\PluginsManager::getInstance()->unloadPlugins(); + \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) { @@ -313,7 +313,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase // restore loaded plugins & piwik options EventDispatcher::getInstance()->clearObservers(TaskScheduler::GET_TASKS_EVENT); - \Piwik\PluginsManager::getInstance()->loadPlugins($plugins); + \Piwik\Plugin\Manager::getInstance()->loadPlugins($plugins); self::resetPiwikOption(); } diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Core/Tracker/ActionTest.php index e25d28e257..f7ceca7412 100644 --- a/tests/PHPUnit/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Core/Tracker/ActionTest.php @@ -22,7 +22,7 @@ class Tracker_ActionTest extends DatabaseTestCase $config->clear(); $config->setTestEnvironment($userFile, false); - \Piwik\PluginsManager::getInstance()->loadPlugins(array('SitesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('SitesManager')); Translate::loadEnglishTranslation(); } diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php index 0de590116c..56821d310a 100644 --- a/tests/PHPUnit/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Core/Tracker/VisitTest.php @@ -22,7 +22,7 @@ class Tracker_VisitTest extends DatabaseTestCase FakeAccess::$superUser = true; Access::setSingletonInstance($pseudoMockAccess); - \Piwik\PluginsManager::getInstance()->loadPlugins(array('SitesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('SitesManager')); } /** diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index babe6f83d2..96c30a8a6b 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -88,7 +88,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase */ protected static function installAndLoadPlugins($installPlugins) { - $pluginsManager = \Piwik\PluginsManager::getInstance(); + $pluginsManager = \Piwik\Plugin\Manager::getInstance(); $plugins = $pluginsManager->readPluginsDirectory(); $pluginsManager->loadPlugins($plugins); @@ -100,7 +100,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase public static function loadAllPlugins() { - $pluginsManager = \Piwik\PluginsManager::getInstance(); + $pluginsManager = \Piwik\Plugin\Manager::getInstance(); $pluginsToLoad = Config::getInstance()->Plugins['Plugins']; $pluginsToLoad[] = 'DevicesDetection'; @@ -110,11 +110,11 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase public static function unloadAllPlugins() { try { - $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins(); foreach ($plugins AS $plugin) { $plugin->uninstall(); } - \Piwik\PluginsManager::getInstance()->unloadPlugins(); + \Piwik\Plugin\Manager::getInstance()->unloadPlugins(); } catch (Exception $e) { } } @@ -168,7 +168,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase DbHelper::createTables(); - \Piwik\PluginsManager::getInstance()->loadPlugins(array()); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array()); } catch (Exception $e) { self::fail("TEST INITIALIZATION FAILED: " . $e->getMessage() . "\n" . $e->getTraceAsString()); } diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php index dfe60e6098..ba36680e48 100755 --- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php +++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php @@ -8,7 +8,7 @@ use Piwik\Common; use Piwik\Plugins\LanguagesManager\API; use Piwik\Translate\Writer; -use Piwik\PluginsManager; +use Piwik\Plugin\Manager; use Piwik\Translate\Validate\NoScripts; use Piwik\Translate\Validate\CoreTranslations; use Piwik\Translate\Filter\ByBaseTranslations; @@ -32,7 +32,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase // we also test that none of the language php files outputs any character on the screen (eg. space before the <?php) $languages = API::getInstance()->getAvailableLanguages(); - $plugins = PluginsManager::getInstance()->readPluginsDirectory(); + $plugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory(); $pluginsWithTranslation = array(); diff --git a/tests/PHPUnit/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Plugins/MobileMessagingTest.php index e3dd3ef3a7..be6c6bdf6d 100644 --- a/tests/PHPUnit/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Plugins/MobileMessagingTest.php @@ -29,8 +29,8 @@ class MobileMessagingTest extends DatabaseTestCase $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test"); - \Piwik\PluginsManager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites')); - \Piwik\PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites')); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); } @@ -43,8 +43,8 @@ class MobileMessagingTest extends DatabaseTestCase public function testWarnUserViaSMSMultiSitesDeactivated() { // safety net - \Piwik\PluginsManager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging')); - $this->assertFalse(\Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging')); + $this->assertFalse(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites')); $APIScheduledReports = APIScheduledReports::getInstance(); $reportId = $APIScheduledReports->addReport( diff --git a/tests/PHPUnit/Plugins/MultiSitesTest.php b/tests/PHPUnit/Plugins/MultiSitesTest.php index f7d47b9ad1..d1b1f5f790 100644 --- a/tests/PHPUnit/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Plugins/MultiSitesTest.php @@ -23,8 +23,8 @@ class MultiSitesTest extends DatabaseTestCase $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test"); - \Piwik\PluginsManager::getInstance()->loadPlugins(array('MultiSites', 'VisitsSummary', 'Actions')); - \Piwik\PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('MultiSites', 'VisitsSummary', 'Actions')); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); } diff --git a/tests/PHPUnit/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Plugins/ScheduledReportsTest.php index 5e18238190..71c2b17cac 100644 --- a/tests/PHPUnit/Plugins/ScheduledReportsTest.php +++ b/tests/PHPUnit/Plugins/ScheduledReportsTest.php @@ -29,8 +29,8 @@ class ScheduledReportsTest extends DatabaseTestCase // setup the access layer self::setSuperUser(); - \Piwik\PluginsManager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging')); - \Piwik\PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging')); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); APISitesManager::getInstance()->addSite("Test", array("http://piwik.net")); @@ -203,7 +203,7 @@ class ScheduledReportsTest extends DatabaseTestCase public function testGetTopMenuTranslationKeyMobileMessagingInactive() { // unload MobileMessaging plugin - \Piwik\PluginsManager::getInstance()->loadPlugins(array('ScheduledReports')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports')); $pdfReportPlugin = new ScheduledReports(); $this->assertEquals( diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Plugins/SegmentEditorTest.php index ab042fbaee..97728d909e 100644 --- a/tests/PHPUnit/Plugins/SegmentEditorTest.php +++ b/tests/PHPUnit/Plugins/SegmentEditorTest.php @@ -17,8 +17,8 @@ class SegmentEditorTest extends DatabaseTestCase { parent::setUp(); - \Piwik\PluginsManager::getInstance()->loadPlugin('SegmentEditor'); - \Piwik\PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->loadPlugin('SegmentEditor'); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); // setup the access layer $pseudoMockAccess = new FakeAccess; diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Plugins/UsersManagerTest.php index c0312d7baa..5c3bdffa29 100644 --- a/tests/PHPUnit/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Plugins/UsersManagerTest.php @@ -16,8 +16,8 @@ class UsersManagerTest extends DatabaseTestCase { parent::setUp(); - \Piwik\PluginsManager::getInstance()->loadPlugin('UsersManager'); - \Piwik\PluginsManager::getInstance()->installLoadedPlugins(); + \Piwik\Plugin\Manager::getInstance()->loadPlugin('UsersManager'); + \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); // setup the access layer $pseudoMockAccess = new FakeAccess; |