| Index: trunk/extensions/MetricsReporting/ApiAnalyticsBase.php |
| — | — | @@ -9,8 +9,8 @@ |
| 10 | 10 | |
| 11 | 11 | protected $isCurrentlyNormalised = false; |
| 12 | 12 | |
| 13 | | - public function __construct( ApiBase $query, $moduleName, $paramPrefix = '' ) { |
| 14 | | - parent::__construct( $query->getMain(), $moduleName, $paramPrefix ); |
| | 13 | + public function __construct( ApiBase $query, $moduleName ) { |
| | 14 | + parent::__construct( $query->getMain(), $moduleName ); |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | /** |
| Index: trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php |
| — | — | @@ -2,8 +2,8 @@ |
| 3 | 3 | |
| 4 | 4 | class SquidPageViewsMetric extends ApiAnalyticsBase { |
| 5 | 5 | |
| 6 | | - public function __construct( ApiBase $query, $moduleName, $paramPrefix = '' ) { |
| 7 | | - parent::__construct( $query->getMain(), $moduleName, $paramPrefix ); |
| | 6 | + public function __construct( ApiBase $query, $moduleName ) { |
| | 7 | + parent::__construct( $query->getMain(), $moduleName ); |
| 8 | 8 | |
| 9 | 9 | $this->normaliseQueryParameters(); |
| 10 | 10 | } |
| Index: trunk/extensions/MetricsReporting/metrics/GenericMetricBase.php |
| — | — | @@ -13,14 +13,11 @@ |
| 14 | 14 | /** |
| 15 | 15 | * @param $query ApiBase |
| 16 | 16 | * @param $moduleName |
| 17 | | - * @param $paramPrefix string |
| 18 | | - * @param $tableName string |
| 19 | 17 | * @return GenericMetricBase |
| 20 | 18 | * |
| 21 | 19 | */ |
| 22 | | - function __construct( ApiBase $query, $moduleName, $paramPrefix = '', $tableName ) { |
| 23 | | - parent::__construct( $query->getMain(), $moduleName, $paramPrefix ); |
| 24 | | - $this->tableName = $tableName; |
| | 20 | + function __construct( ApiBase $query, $moduleName ) { |
| | 21 | + parent::__construct( $query->getMain(), $moduleName ); |
| 25 | 22 | } |
| 26 | 23 | |
| 27 | 24 | public function getAllowedFilters() { |
| Index: trunk/extensions/MetricsReporting/metrics/EditorsByGeographyMetric.php |
| — | — | @@ -4,13 +4,9 @@ |
| 5 | 5 | * |
| 6 | 6 | */ |
| 7 | 7 | class EditorsByGeographyMetric extends GenericMetricBase { |
| 8 | | - /** |
| 9 | | - * @param $tableName string |
| 10 | | - */ |
| 11 | | - function __construct( ApiBase $query, $moduleName, $paramPrefix = '', $tableName ) { |
| 12 | | - parent::__construct( $query->getMain(), $moduleName, $paramPrefix, 'editorsbygeography' ); |
| 13 | | - } |
| 14 | 8 | |
| | 9 | + protected $tableName = 'editorsbygeography'; |
| | 10 | + |
| 15 | 11 | public function getDescription() { |
| 16 | 12 | return "Number of active unique registered editors by country"; |
| 17 | 13 | } |
| Index: trunk/extensions/MetricsReporting/metrics/DumpActiveEditors100Metric.php |
| — | — | @@ -2,8 +2,8 @@ |
| 3 | 3 | |
| 4 | 4 | class DumpActiveEditors100Metric extends DumpActiveEditors5Metric { |
| 5 | 5 | |
| 6 | | - public function __construct( ApiBase $query, $moduleName, $paramPrefix = '' ) { |
| 7 | | - parent::__construct( $query->getMain(), $moduleName, $paramPrefix ); |
| | 6 | + public function __construct( ApiBase $query, $moduleName ) { |
| | 7 | + parent::__construct( $query->getMain(), $moduleName ); |
| 8 | 8 | $this->numberOfActiveEditors = 100; |
| 9 | 9 | } |
| 10 | 10 | |