From 893801a082a173e645f31f00b4f6ef1ed29bb512 Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Wed, 16 Jul 2014 14:35:43 +0200 Subject: fixed field visibility keyword order --- core/ArchiveProcessor/Rules.php | 2 +- core/CronArchive.php | 2 +- core/DataAccess/ArchiveTableCreator.php | 2 +- core/DataTable/Filter/RangeCheck.php | 4 ++-- core/DataTable/Renderer.php | 2 +- core/Metrics.php | 6 +++--- core/Option.php | 2 +- core/QuickForm2.php | 2 +- core/ReportRenderer.php | 2 +- core/Tracker.php | 12 ++++++------ core/Tracker/Cache.php | 2 +- core/WidgetsList.php | 6 +++--- plugins/Actions/Archiver.php | 4 ++-- plugins/Actions/ArchivingHelper.php | 18 +++++++++--------- plugins/CoreHome/Columns/VisitGoalBuyer.php | 2 +- plugins/ImageGraph/API.php | 4 ++-- plugins/ImageGraph/ImageGraph.php | 4 ++-- plugins/ImageGraph/StaticGraph.php | 2 +- plugins/MobileMessaging/MobileMessaging.php | 8 ++++---- plugins/MobileMessaging/SMSProvider.php | 2 +- plugins/MultiSites/API.php | 2 +- plugins/ScheduledReports/ScheduledReports.php | 6 +++--- plugins/UserSettings/UserSettings.php | 2 +- plugins/UsersManager/API.php | 2 +- 24 files changed, 50 insertions(+), 50 deletions(-) diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php index 6b912c02f3..dec40d7568 100644 --- a/core/ArchiveProcessor/Rules.php +++ b/core/ArchiveProcessor/Rules.php @@ -33,7 +33,7 @@ class Rules const FLAG_TABLE_PURGED = 'lastPurge_'; - static public $purgeOutdatedArchivesIsDisabled = false; + public static $purgeOutdatedArchivesIsDisabled = false; /** Flag that will forcefully disable the archiving process (used in tests only) */ public static $archivingDisabledByTests = false; diff --git a/core/CronArchive.php b/core/CronArchive.php index 51fadb021b..8f716ad949 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -23,7 +23,7 @@ use Piwik\Plugins\SitesManager\API as APISitesManager; class CronArchive { // the url can be set here before the init, and it will be used instead of --url= - static public $url = false; + public static $url = false; // Max parallel requests for a same site's segments const MAX_CONCURRENT_API_REQUESTS = 3; diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php index a89f46999c..67abd2b123 100644 --- a/core/DataAccess/ArchiveTableCreator.php +++ b/core/DataAccess/ArchiveTableCreator.php @@ -21,7 +21,7 @@ class ArchiveTableCreator const BLOB_TABLE = "blob"; - static public $tablesAlreadyInstalled = null; + public static $tablesAlreadyInstalled = null; public static function getNumericTable(Date $date) { diff --git a/core/DataTable/Filter/RangeCheck.php b/core/DataTable/Filter/RangeCheck.php index 4cee80d11f..19dad66cb4 100644 --- a/core/DataTable/Filter/RangeCheck.php +++ b/core/DataTable/Filter/RangeCheck.php @@ -17,8 +17,8 @@ use Piwik\DataTable\BaseFilter; */ class RangeCheck extends BaseFilter { - static public $minimumValue = 0.00; - static public $maximumValue = 100.0; + public static $minimumValue = 0.00; + public static $maximumValue = 100.0; /** * @param DataTable $table diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 7ab968aa62..679d261f3f 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -169,7 +169,7 @@ abstract class Renderer /** * @var array */ - static protected $availableRenderers = array('xml', + protected static $availableRenderers = array('xml', 'json', 'csv', 'tsv', diff --git a/core/Metrics.php b/core/Metrics.php index 3c20264046..3d6e8b84f7 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -89,7 +89,7 @@ class Metrics const INDEX_GOAL_ECOMMERCE_REVENUE_DISCOUNT = 7; const INDEX_GOAL_ECOMMERCE_ITEMS = 8; - static public $mappingFromIdToName = array( + public static $mappingFromIdToName = array( Metrics::INDEX_NB_UNIQ_VISITORS => 'nb_uniq_visitors', Metrics::INDEX_NB_VISITS => 'nb_visits', Metrics::INDEX_NB_ACTIONS => 'nb_actions', @@ -138,7 +138,7 @@ class Metrics ); - static public $mappingFromIdToNameGoal = array( + public static $mappingFromIdToNameGoal = array( Metrics::INDEX_GOAL_NB_CONVERSIONS => 'nb_conversions', Metrics::INDEX_GOAL_NB_VISITS_CONVERTED => 'nb_visits_converted', Metrics::INDEX_GOAL_REVENUE => 'revenue', @@ -149,7 +149,7 @@ class Metrics Metrics::INDEX_GOAL_ECOMMERCE_ITEMS => 'items', ); - static protected $metricsAggregatedFromLogs = array( + protected static $metricsAggregatedFromLogs = array( Metrics::INDEX_NB_UNIQ_VISITORS, Metrics::INDEX_NB_VISITS, Metrics::INDEX_NB_ACTIONS, diff --git a/core/Option.php b/core/Option.php index c491df6ef2..1c403547d9 100644 --- a/core/Option.php +++ b/core/Option.php @@ -127,7 +127,7 @@ class Option * Singleton instance * @var \Piwik\Option */ - static private $instance = null; + private static $instance = null; /** * Returns Singleton instance diff --git a/core/QuickForm2.php b/core/QuickForm2.php index 1580f012c6..e2ecbf5b3c 100644 --- a/core/QuickForm2.php +++ b/core/QuickForm2.php @@ -118,7 +118,7 @@ abstract class QuickForm2 extends HTML_QuickForm2 return array_filter($messages); } - static protected $registered = false; + protected static $registered = false; /** * Returns the rendered form as an array. diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index edd54f0a2d..44fc77f632 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -33,7 +33,7 @@ abstract class ReportRenderer const PDF_FORMAT = 'pdf'; const CSV_FORMAT = 'csv'; - static private $availableReportRenderers = array( + private static $availableReportRenderers = array( self::PDF_FORMAT, self::HTML_FORMAT, self::CSV_FORMAT, diff --git a/core/Tracker.php b/core/Tracker.php index 0812df674e..d3c750ac62 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -43,12 +43,12 @@ class Tracker const LENGTH_HEX_ID_STRING = 16; const LENGTH_BINARY_ID = 8; - static protected $forcedDateTime = null; - static protected $forcedIpString = null; - static protected $forcedVisitorId = null; + protected static $forcedDateTime = null; + protected static $forcedIpString = null; + protected static $forcedVisitorId = null; - static protected $pluginsNotToLoad = array(); - static protected $pluginsToLoad = array(); + protected static $pluginsNotToLoad = array(); + protected static $pluginsToLoad = array(); /** * The set of visits to track. @@ -396,7 +396,7 @@ class Tracker Common::printDebug("Next run will be from: " . date('Y-m-d H:i:s', $nextRunTime) . ' UTC'); } - static public $initTrackerMode = false; + public static $initTrackerMode = false; /** * Used to initialize core Piwik components on a piwik.php request diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php index 163ece0864..77f9d37689 100644 --- a/core/Tracker/Cache.php +++ b/core/Tracker/Cache.php @@ -26,7 +26,7 @@ class Cache * Public for tests only * @var CacheFile */ - static public $trackerCache = null; + public static $trackerCache = null; protected static function getInstance() { diff --git a/core/WidgetsList.php b/core/WidgetsList.php index d155121ddb..d9ae1f4eb6 100644 --- a/core/WidgetsList.php +++ b/core/WidgetsList.php @@ -28,21 +28,21 @@ class WidgetsList extends Singleton * * @var array */ - static protected $widgets = array(); + protected static $widgets = array(); /** * Indicates whether the hook was posted or not * * @var bool */ - static protected $hookCalled = false; + protected static $hookCalled = false; /** * In get() we won't use a cached result in case this is true. Instead we will sort the widgets again and cache * a new result. To make tests work... * @var bool */ - static private $listCacheToBeInvalidated = false; + private static $listCacheToBeInvalidated = false; /** * Returns all available widgets. diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 2df5402578..30146cbac3 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -56,12 +56,12 @@ class Archiver extends \Piwik\Plugin\Archiver Action::TYPE_PAGE_TITLE, Action::TYPE_SITE_SEARCH, ); - static protected $columnsToRenameAfterAggregation = array( + protected static $columnsToRenameAfterAggregation = array( Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS, Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS => Metrics::INDEX_PAGE_ENTRY_SUM_DAILY_NB_UNIQ_VISITORS, Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS => Metrics::INDEX_PAGE_EXIT_SUM_DAILY_NB_UNIQ_VISITORS, ); - static public $columnsToDeleteAfterAggregation = array( + public static $columnsToDeleteAfterAggregation = array( Metrics::INDEX_NB_UNIQ_VISITORS, Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS, Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 48b08d7407..86e035f458 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -284,15 +284,15 @@ class ArchivingHelper return $newValue; } - static public $maximumRowsInDataTableLevelZero; - static public $maximumRowsInSubDataTable; - static public $columnToSortByBeforeTruncation; + public static $maximumRowsInDataTableLevelZero; + public static $maximumRowsInSubDataTable; + public static $columnToSortByBeforeTruncation; - static protected $actionUrlCategoryDelimiter = null; - static protected $actionTitleCategoryDelimiter = null; - static protected $defaultActionName = null; - static protected $defaultActionNameWhenNotDefined = null; - static protected $defaultActionUrlWhenNotDefined = null; + protected static $actionUrlCategoryDelimiter = null; + protected static $actionTitleCategoryDelimiter = null; + protected static $defaultActionName = null; + protected static $defaultActionNameWhenNotDefined = null; + protected static $defaultActionUrlWhenNotDefined = null; public static function reloadConfig() { @@ -477,7 +477,7 @@ class ArchivingHelper /** * Static cache to store Rows during processing */ - static protected $cacheParsedAction = array(); + protected static $cacheParsedAction = array(); public static function clearActionsCache() { diff --git a/plugins/CoreHome/Columns/VisitGoalBuyer.php b/plugins/CoreHome/Columns/VisitGoalBuyer.php index de06aa85c6..1fcf91cb96 100644 --- a/plugins/CoreHome/Columns/VisitGoalBuyer.php +++ b/plugins/CoreHome/Columns/VisitGoalBuyer.php @@ -24,7 +24,7 @@ class VisitGoalBuyer extends VisitDimension const TYPE_BUYER_OPEN_CART = GoalManager::TYPE_BUYER_OPEN_CART; const TYPE_BUYER_ORDERED_AND_OPEN_CART = GoalManager::TYPE_BUYER_ORDERED_AND_OPEN_CART; - static protected $visitEcommerceStatus = array( + protected static $visitEcommerceStatus = array( self::TYPE_BUYER_NONE => 'none', self::TYPE_BUYER_ORDERED => 'ordered', self::TYPE_BUYER_OPEN_CART => 'abandonedCart', diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index 1aa5348b60..1ce331d9d8 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -41,7 +41,7 @@ class API extends \Piwik\Plugin\API const MAX_WIDTH = 2048; const MAX_HEIGHT = 2048; - static private $DEFAULT_PARAMETERS = array( + private static $DEFAULT_PARAMETERS = array( StaticGraph::GRAPH_TYPE_BASIC_LINE => array( self::FILENAME_KEY => 'BasicLine', self::TRUNCATE_KEY => 6, @@ -74,7 +74,7 @@ class API extends \Piwik\Plugin\API ), ); - static private $DEFAULT_GRAPH_TYPE_OVERRIDE = array( + private static $DEFAULT_GRAPH_TYPE_OVERRIDE = array( 'UserSettings_getPlugin' => array( false // override if !$isMultiplePeriod => StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR, diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index bcc6833b89..0344d8567f 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -27,12 +27,12 @@ class ImageGraph extends \Piwik\Plugin return $info; } - static private $CONSTANT_ROW_COUNT_REPORT_EXCEPTIONS = array( + private static $CONSTANT_ROW_COUNT_REPORT_EXCEPTIONS = array( 'Referrers_getReferrerType', ); // row evolution support not yet implemented for these APIs - static private $REPORTS_DISABLED_EVOLUTION_GRAPH = array( + private static $REPORTS_DISABLED_EVOLUTION_GRAPH = array( 'Referrers_getAll', ); diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index b21d5e35ac..0ece9a173d 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -32,7 +32,7 @@ abstract class StaticGraph const GRAPH_TYPE_3D_PIE = "3dPie"; const GRAPH_TYPE_BASIC_PIE = "pie"; - static private $availableStaticGraphTypes = array( + private static $availableStaticGraphTypes = array( self::GRAPH_TYPE_BASIC_LINE => 'Evolution', self::GRAPH_TYPE_VERTICAL_BAR => 'VerticalBar', self::GRAPH_TYPE_HORIZONTAL_BAR => 'HorizontalBar', diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index b1790702c5..884ff9b63a 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -36,19 +36,19 @@ class MobileMessaging extends \Piwik\Plugin const MOBILE_TYPE = 'mobile'; const SMS_FORMAT = 'sms'; - static private $availableParameters = array( + private static $availableParameters = array( self::PHONE_NUMBERS_PARAMETER => true, ); - static private $managedReportTypes = array( + private static $managedReportTypes = array( self::MOBILE_TYPE => 'plugins/MobileMessaging/images/phone.png' ); - static private $managedReportFormats = array( + private static $managedReportFormats = array( self::SMS_FORMAT => 'plugins/MobileMessaging/images/phone.png' ); - static private $availableReports = array( + private static $availableReports = array( array( 'module' => 'MultiSites', 'action' => 'getAll', diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index eb91a1ea1a..9bbf0758ed 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -23,7 +23,7 @@ abstract class SMSProvider const MAX_UCS2_CHARS_IN_ONE_UNIQUE_SMS = 70; const MAX_UCS2_CHARS_IN_ONE_CONCATENATED_SMS = 67; - static public $availableSMSProviders = array( + public static $availableSMSProviders = array( 'Clockwork' => 'You can use to send SMS Reports from Piwik.