From a054de65ed078a7786033f8e2793438ecdb65840 Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Wed, 16 Jul 2014 14:33:05 +0200 Subject: fixed method visibility keyword order --- plugins/API/API.php | 2 +- plugins/Actions/Actions.php | 4 ++-- plugins/Actions/Archiver.php | 2 +- plugins/Actions/ArchivingHelper.php | 10 +++++----- plugins/CoreAdminHome/API.php | 2 +- plugins/CoreAdminHome/Controller.php | 2 +- plugins/CoreConsole/Commands/CoreArchiver.php | 2 +- plugins/CoreHome/Columns/VisitGoalBuyer.php | 6 +++--- plugins/CoreUpdater/Controller.php | 2 +- plugins/Events/Events.php | 2 +- plugins/Goals/Archiver.php | 4 ++-- plugins/Goals/Goals.php | 6 +++--- plugins/Installation/ServerFilesGenerator.php | 2 +- plugins/LanguagesManager/LanguagesManager.php | 10 +++++----- plugins/Login/Controller.php | 2 +- plugins/Login/Login.php | 2 +- plugins/MobileMessaging/API.php | 2 +- plugins/MobileMessaging/MobileMessaging.php | 2 +- plugins/MobileMessaging/SMSProvider.php | 12 ++++++------ plugins/Provider/Provider.php | 2 +- plugins/Proxy/Controller.php | 2 +- plugins/Referrers/API.php | 4 ++-- plugins/SEO/RankChecker.php | 2 +- plugins/ScheduledReports/API.php | 12 ++++++------ plugins/ScheduledReports/ScheduledReports.php | 8 ++++---- plugins/SitesManager/SitesManager.php | 2 +- plugins/UserCountryMap/UserCountryMap.php | 2 +- plugins/UsersManager/API.php | 2 +- plugins/VisitorInterest/VisitorInterest.php | 4 ++-- plugins/VisitsSummary/Controller.php | 4 ++-- 30 files changed, 60 insertions(+), 60 deletions(-) (limited to 'plugins') diff --git a/plugins/API/API.php b/plugins/API/API.php index 3253ae5f21..b72ab0ee86 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -86,7 +86,7 @@ class API extends \Piwik\Plugin\API * translated here. * @return array */ - static public function getDefaultMetricTranslations() + public static function getDefaultMetricTranslations() { return Metrics::getDefaultMetricTranslations(); } diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 91042fce4f..3407c7f8e2 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -123,14 +123,14 @@ class Actions extends \Piwik\Plugin return true; } - static public function checkCustomVariablesPluginEnabled() + public static function checkCustomVariablesPluginEnabled() { if (!self::isCustomVariablesPluginsEnabled()) { throw new \Exception("To Track Site Search Categories, please ask the Piwik Administrator to enable the 'Custom Variables' plugin in Settings > Plugins."); } } - static public function isCustomVariablesPluginsEnabled() + public static function isCustomVariablesPluginsEnabled() { return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables'); } diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 758e3acb85..2df5402578 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -121,7 +121,7 @@ class Archiver extends \Piwik\Plugin\Archiver /** * @return string */ - static public function getWhereClauseActionIsNotEvent() + public static function getWhereClauseActionIsNotEvent() { return " AND log_link_visit_action.idaction_event_category IS NULL"; } diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 908375d032..48b08d7407 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -38,7 +38,7 @@ class ArchivingHelper * @param array $actionsTablesByType * @return int */ - static public function updateActionsTableWithRowQuery($query, $fieldQueried, & $actionsTablesByType) + public static function updateActionsTableWithRowQuery($query, $fieldQueried, & $actionsTablesByType) { $rowsProcessed = 0; while ($row = $query->fetch()) { @@ -294,7 +294,7 @@ class ArchivingHelper static protected $defaultActionNameWhenNotDefined = null; static protected $defaultActionUrlWhenNotDefined = null; - static public function reloadConfig() + public static function reloadConfig() { // for BC, we read the old style delimiter first (see #1067)Row $actionDelimiter = @Config::getInstance()->General['action_category_delimiter']; @@ -320,7 +320,7 @@ class ArchivingHelper * * @return Row */ - static private function getDefaultRow() + private static function getDefaultRow() { static $row = false; if ($row === false) { @@ -390,7 +390,7 @@ class ArchivingHelper * @param $type * @return string */ - static public function getUnknownActionName($type) + public static function getUnknownActionName($type) { if (empty(self::$defaultActionNameWhenNotDefined)) { self::$defaultActionNameWhenNotDefined = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageName')); @@ -425,7 +425,7 @@ class ArchivingHelper * @param int $urlPrefix url prefix (only used for TYPE_PAGE_URL) * @return array of exploded elements from $name */ - static public function getActionExplodedNames($name, $type, $urlPrefix = null) + public static function getActionExplodedNames($name, $type, $urlPrefix = null) { // Site Search does not split Search keywords if ($type == Action::TYPE_SITE_SEARCH) { diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index d651c8f1ca..e18bd3f031 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -193,7 +193,7 @@ class API extends \Piwik\Plugin\API * @ignore * @return mixed */ - static public function getWebsiteIdsToInvalidate() + public static function getWebsiteIdsToInvalidate() { Piwik::checkUserHasSomeAdminAccess(); diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index e50451fd84..7de5be31d0 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -273,7 +273,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin return '0'; } - static public function isGeneralSettingsAdminEnabled() + public static function isGeneralSettingsAdminEnabled() { return (bool) Config::getInstance()->General['enable_general_settings_admin']; } diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php index 89b6bd9a9b..dda827b33e 100644 --- a/plugins/CoreConsole/Commands/CoreArchiver.php +++ b/plugins/CoreConsole/Commands/CoreArchiver.php @@ -43,7 +43,7 @@ class CoreArchiver extends ConsoleCommand } // This is reused by another console command - static public function configureArchiveCommand(ConsoleCommand $command) + public static function configureArchiveCommand(ConsoleCommand $command) { $command->setName('core:archive'); $command->setDescription("Runs the CLI archiver. It is an important tool for general maintenance and to keep Piwik very fast."); diff --git a/plugins/CoreHome/Columns/VisitGoalBuyer.php b/plugins/CoreHome/Columns/VisitGoalBuyer.php index 7b9b79f50f..de06aa85c6 100644 --- a/plugins/CoreHome/Columns/VisitGoalBuyer.php +++ b/plugins/CoreHome/Columns/VisitGoalBuyer.php @@ -83,7 +83,7 @@ class VisitGoalBuyer extends VisitDimension return false; } - static public function getVisitEcommerceStatus($status) + public static function getVisitEcommerceStatus($status) { $id = array_search($status, self::$visitEcommerceStatus); @@ -97,7 +97,7 @@ class VisitGoalBuyer extends VisitDimension /** * @ignore */ - static public function getVisitEcommerceStatusFromId($id) + public static function getVisitEcommerceStatusFromId($id) { if (!isset(self::$visitEcommerceStatus[$id])) { throw new \Exception("Unexpected ECommerce status value "); @@ -128,4 +128,4 @@ class VisitGoalBuyer extends VisitDimension return self::TYPE_BUYER_OPEN_CART; } -} \ No newline at end of file +} diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index c2977088aa..c14078e1ad 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -46,7 +46,7 @@ class Controller extends \Piwik\Plugin\Controller private $pathPiwikZip = false; private $newVersion; - static protected function getLatestZipUrl($newVersion) + protected static function getLatestZipUrl($newVersion) { if (@Config::getInstance()->Debug['allow_upgrades_to_beta']) { return 'http://builds.piwik.org/piwik-' . $newVersion . '.zip'; diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php index 4992ca3452..088eb213a1 100644 --- a/plugins/Events/Events.php +++ b/plugins/Events/Events.php @@ -75,7 +75,7 @@ class Events extends \Piwik\Plugin /** * @return array */ - static public function getLabelTranslations() + public static function getLabelTranslations() { return array( 'getCategory' => array('Events_EventCategories', 'Events_EventCategory'), diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 4d727adbd6..146cdccd6f 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -186,7 +186,7 @@ class Archiver extends \Piwik\Plugin\Archiver * @param int|bool $idGoal idGoal to return the metrics for, or false to return overall * @return string Archive record name */ - static public function getRecordName($recordName, $idGoal = false) + public static function getRecordName($recordName, $idGoal = false) { $idGoalStr = ''; if ($idGoal !== false) { @@ -356,7 +356,7 @@ class Archiver extends \Piwik\Plugin\Archiver return array(GoalManager::IDGOAL_CART, GoalManager::IDGOAL_ORDER); } - static public function getItemRecordNameAbandonedCart($recordName) + public static function getItemRecordNameAbandonedCart($recordName) { return $recordName . '_Cart'; } diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 0aea5cb842..39a7c0b2dc 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -30,7 +30,7 @@ class Goals extends \Piwik\Plugin return $info; } - static public function getReportsWithGoalMetrics() + public static function getReportsWithGoalMetrics() { $dimensions = self::getAllReportsWithGoalMetrics(); @@ -64,7 +64,7 @@ class Goals extends \Piwik\Plugin return $orderA > $orderB; } - static public function getGoalColumns($idGoal) + public static function getGoalColumns($idGoal) { $columns = array( 'nb_conversions', @@ -177,7 +177,7 @@ class Goals extends \Piwik\Plugin } } - static private function getAllReportsWithGoalMetrics() + private static function getAllReportsWithGoalMetrics() { $reportsWithGoals = array(); diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php index 5b38fcf1d0..df0c91f081 100644 --- a/plugins/Installation/ServerFilesGenerator.php +++ b/plugins/Installation/ServerFilesGenerator.php @@ -64,7 +64,7 @@ class ServerFilesGenerator } } - static public function createHtAccessDenyAll($path) + public static function createHtAccessDenyAll($path) { self::createHtAccess($path, $overwrite = false, self::getDenyAllHtaccessContent()); } diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index c192b3b4af..e8b7693bf2 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -125,7 +125,7 @@ class LanguagesManager extends \Piwik\Plugin /** * @return string Two letters language code, eg. "fr" */ - static public function getLanguageCodeForCurrentUser() + public static function getLanguageCodeForCurrentUser() { $languageCode = self::getLanguageFromPreferences(); if (!API::getInstance()->isLanguageAvailable($languageCode)) { @@ -140,7 +140,7 @@ class LanguagesManager extends \Piwik\Plugin /** * @return string Full english language string, eg. "French" */ - static public function getLanguageNameForCurrentUser() + public static function getLanguageNameForCurrentUser() { $languageCode = self::getLanguageCodeForCurrentUser(); $languages = API::getInstance()->getAvailableLanguageNames(); @@ -155,7 +155,7 @@ class LanguagesManager extends \Piwik\Plugin /** * @return string|false if language preference could not be loaded */ - static protected function getLanguageFromPreferences() + protected static function getLanguageFromPreferences() { if (($language = self::getLanguageForSession()) != null) { return $language; @@ -174,7 +174,7 @@ class LanguagesManager extends \Piwik\Plugin * * @return string|null */ - static public function getLanguageForSession() + public static function getLanguageForSession() { $cookieName = Config::getInstance()->General['language_cookie_name']; $cookie = new Cookie($cookieName); @@ -190,7 +190,7 @@ class LanguagesManager extends \Piwik\Plugin * @param string $languageCode ISO language code * @return bool */ - static public function setLanguageForSession($languageCode) + public static function setLanguageForSession($languageCode) { if (!API::getInstance()->isLanguageAvailable($languageCode)) { return false; diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 395c26d7b4..cce38665a6 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -430,7 +430,7 @@ class Controller extends \Piwik\Plugin\Controller * @param none * @return void */ - static public function clearSession() + public static function clearSession() { $authCookieName = Config::getInstance()->General['login_cookie_name']; $cookie = new Cookie($authCookieName); diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index e44486a24a..a805094df8 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -62,7 +62,7 @@ class Login extends \Piwik\Plugin \Piwik\Registry::get('auth')->setTokenAuth($tokenAuth); } - static protected function isModuleIsAPI() + protected static function isModuleIsAPI() { return Piwik::getModule() === 'API' && (Piwik::getAction() == '' || Piwik::getAction() == 'index'); diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php index 51b14d851e..c8268c76a7 100644 --- a/plugins/MobileMessaging/API.php +++ b/plugins/MobileMessaging/API.php @@ -30,7 +30,7 @@ class API extends \Piwik\Plugin\API * @param string $provider * @return SMSProvider */ - static private function getSMSProviderInstance($provider) + private static function getSMSProviderInstance($provider) { return SMSProvider::factory($provider); } diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index fb53b75262..b1790702c5 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -199,7 +199,7 @@ class MobileMessaging extends \Piwik\Plugin } } - static public function template_reportParametersScheduledReports(&$out) + public static function template_reportParametersScheduledReports(&$out) { if (Piwik::isUserIsAnonymous()) { return; diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index 9f470ef4d1..eb91a1ea1a 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -45,7 +45,7 @@ abstract class SMSProvider * @param string $providerName * @return \Piwik\Plugins\MobileMessaging\SMSProvider */ - static public function factory($providerName) + public static function factory($providerName) { $className = __NAMESPACE__ . '\\SMSProvider\\' . $providerName; @@ -68,7 +68,7 @@ abstract class SMSProvider * @param string $string * @return bool true if $string contains UCS2 characters */ - static public function containsUCS2Characters($string) + public static function containsUCS2Characters($string) { $GSMCharsetAsString = implode(array_keys(GSMCharset::$GSMCharset)); @@ -90,7 +90,7 @@ abstract class SMSProvider * @param string $appendedString * @return string original $string or truncated $string appended with $appendedString */ - static public function truncate($string, $maximumNumberOfConcatenatedSMS, $appendedString = 'MobileMessaging_SMS_Content_Too_Long') + public static function truncate($string, $maximumNumberOfConcatenatedSMS, $appendedString = 'MobileMessaging_SMS_Content_Too_Long') { $appendedString = Piwik::translate($appendedString); @@ -117,12 +117,12 @@ abstract class SMSProvider return preg_replace('/' . preg_quote($subStrToTruncate, '/') . '$/', $appendedString, $string); } - static private function mb_str_split($string) + private static function mb_str_split($string) { return preg_split('//u', $string, -1, PREG_SPLIT_NO_EMPTY); } - static private function sizeOfSMSContent($smsContent, $containsUCS2Chars) + private static function sizeOfSMSContent($smsContent, $containsUCS2Chars) { if ($containsUCS2Chars) return mb_strlen($smsContent, 'UTF-8'); @@ -133,7 +133,7 @@ abstract class SMSProvider return $sizeOfSMSContent; } - static private function maxCharsAllowed($maximumNumberOfConcatenatedSMS, $containsUCS2Chars) + private static function maxCharsAllowed($maximumNumberOfConcatenatedSMS, $containsUCS2Chars) { $maxCharsInOneUniqueSMS = $containsUCS2Chars ? self::MAX_UCS2_CHARS_IN_ONE_UNIQUE_SMS : self::MAX_GSM_CHARS_IN_ONE_UNIQUE_SMS; $maxCharsInOneConcatenatedSMS = $containsUCS2Chars ? self::MAX_UCS2_CHARS_IN_ONE_CONCATENATED_SMS : self::MAX_GSM_CHARS_IN_ONE_CONCATENATED_SMS; diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index d98d0571b0..9c06887c1e 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -44,7 +44,7 @@ class Provider extends \Piwik\Plugin Piwik::addAction('Template.footerUserCountry', array('Piwik\Plugins\Provider\Provider', 'footerUserCountry')); } - static public function footerUserCountry(&$out) + public static function footerUserCountry(&$out) { $out = '

' . Piwik::translate('Provider_WidgetProviders') . '

'; diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 1b8d054481..3097c786b5 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -108,7 +108,7 @@ class Controller extends \Piwik\Plugin\Controller * @param string $url * @return bool True if valid; false otherwise */ - static public function isPiwikUrl($url) + public static function isPiwikUrl($url) { // guard for IE6 meta refresh parsing weakness (OSVDB 19029) if (strpos($url, ';') !== false diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index a2c747141b..91fe2dbab2 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -151,7 +151,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getKeywordNotDefinedString() + public static function getKeywordNotDefinedString() { return Piwik::translate('General_NotDefined', Piwik::translate('General_ColumnKeyword')); } @@ -159,7 +159,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getCleanKeyword($label) + public static function getCleanKeyword($label) { return $label == self::LABEL_KEYWORD_NOT_DEFINED ? self::getKeywordNotDefinedString() diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php index 0a54ca63e7..88010814a1 100644 --- a/plugins/SEO/RankChecker.php +++ b/plugins/SEO/RankChecker.php @@ -38,7 +38,7 @@ class RankChecker * @param string $url * @return string */ - static public function extractDomainFromUrl($url) + public static function extractDomainFromUrl($url) { return preg_replace( array( diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index 67ed97cc8f..4f09960119 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -729,7 +729,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getReportMetadata($idSite, $reportType) + public static function getReportMetadata($idSite, $reportType) { $availableReportMetadata = array(); @@ -758,7 +758,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function allowMultipleReports($reportType) + public static function allowMultipleReports($reportType) { $allowMultipleReports = null; @@ -785,7 +785,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getReportTypes() + public static function getReportTypes() { $reportTypes = array(); @@ -806,7 +806,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getReportFormats($reportType) + public static function getReportFormats($reportType) { $reportFormats = array(); @@ -833,7 +833,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getReportRecipients($report) + public static function getReportRecipients($report) { $recipients = array(); @@ -861,7 +861,7 @@ class API extends \Piwik\Plugin\API /** * @ignore */ - static public function getSegment($idSegment) + public static function getSegment($idSegment) { if (self::isSegmentEditorActivated() && !empty($idSegment)) { diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index 41d8306c10..521bcae3d6 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -153,7 +153,7 @@ class ScheduledReports extends \Piwik\Plugin } // based on http://www.php.net/manual/en/filter.filters.validate.php -> FILTER_VALIDATE_BOOLEAN - static private function valueIsTrue($value) + private static function valueIsTrue($value) { return $value == 'true' || $value == 1 || $value == '1' || $value === true; } @@ -447,7 +447,7 @@ class ScheduledReports extends \Piwik\Plugin } } - static public function template_reportParametersScheduledReports(&$out) + public static function template_reportParametersScheduledReports(&$out) { $view = new View('@ScheduledReports/reportParametersScheduledReports'); $view->currentUserEmail = Piwik::getCurrentUserEmail(); @@ -582,7 +582,7 @@ class ScheduledReports extends \Piwik\Plugin * Used in the Report Listing * @ignore */ - static public function getPeriodToFrequency() + public static function getPeriodToFrequency() { return array( ScheduledTime::PERIOD_NEVER => Piwik::translate('General_Never'), @@ -596,7 +596,7 @@ class ScheduledReports extends \Piwik\Plugin * Used in the Report's email content, ie "monthly report" * @ignore */ - static public function getPeriodToFrequencyAsAdjective() + public static function getPeriodToFrequencyAsAdjective() { return array( ScheduledTime::PERIOD_DAY => Piwik::translate('General_DailyReport'), diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index edd72bdb4c..82d12e3cee 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -171,7 +171,7 @@ class SitesManager extends \Piwik\Plugin * @param string $parameters The unfiltered list. * @return array The filtered list of strings as an array. */ - static private function filterBlankFromCommaSepList($parameters) + private static function filterBlankFromCommaSepList($parameters) { $parameters = explode(',', $parameters); $parameters = array_filter($parameters, 'strlen'); diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 8bc5a93ff9..75df3df8c9 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -40,7 +40,7 @@ class UserCountryMap extends \Piwik\Plugin Piwik::addAction('Template.leftColumnUserCountry', array('Piwik\Plugins\UserCountryMap\UserCountryMap', 'insertMapInLocationReport')); } - static public function insertMapInLocationReport(&$out) + public static function insertMapInLocationReport(&$out) { $out = '

' . Piwik::translate('UserCountryMap_VisitorMap') . '

'; $out .= FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap'); diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 15c8af8bb4..d8613c5edd 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -57,7 +57,7 @@ class API extends \Piwik\Plugin\API * @throws Exception * @return \Piwik\Plugins\UsersManager\API */ - static public function getInstance() + public static function getInstance() { try { $instance = \Piwik\Registry::get('UsersManager_API'); diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index 3a38f40c18..70f5c48e4f 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -27,12 +27,12 @@ class VisitorInterest extends \Piwik\Plugin Piwik::addAction('Template.footerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'footerVisitsFrequency')); } - static public function headerVisitsFrequency(&$out) + public static function headerVisitsFrequency(&$out) { $out = '
'; } - static public function footerVisitsFrequency(&$out) + public static function footerVisitsFrequency(&$out) { $out = '
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 44c1565b27..1804ebea54 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -100,7 +100,7 @@ class Controller extends \Piwik\Plugin\Controller return $this->renderView($view); } - static public function getVisitsSummary() + public static function getVisitsSummary() { $requestString = "method=VisitsSummary.get" . "&format=original" . @@ -112,7 +112,7 @@ class Controller extends \Piwik\Plugin\Controller return empty($result) ? new DataTable() : $result; } - static public function getVisits() + public static function getVisits() { $requestString = "method=VisitsSummary.getVisits" . "&format=original" . -- cgit v1.2.3