From 899f1e2a6ef89c4f777be49047ba229a2edbee9e Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Tue, 17 Dec 2013 23:39:56 +0000
Subject: [PATCH] rename class Filter -> BaseFilter to prevent error "two
constructors are defined on PHP 5.3.2"
---
core/API/DataTableManipulator/ReportTotalsCalculator.php | 2 +-
core/DataTable.php | 8 ++++----
core/DataTable/{Filter.php => BaseFilter.php} | 6 +++---
core/DataTable/Filter/AddColumnsProcessedMetrics.php | 4 ++--
core/DataTable/Filter/AddSummaryRow.php | 4 ++--
core/DataTable/Filter/ColumnCallbackAddColumn.php | 4 ++--
core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php | 4 ++--
core/DataTable/Filter/ColumnCallbackAddMetadata.php | 4 ++--
core/DataTable/Filter/ColumnCallbackDeleteRow.php | 4 ++--
core/DataTable/Filter/ColumnCallbackReplace.php | 4 ++--
core/DataTable/Filter/ColumnDelete.php | 4 ++--
core/DataTable/Filter/ExcludeLowPopulation.php | 4 ++--
core/DataTable/Filter/GroupBy.php | 4 ++--
core/DataTable/Filter/Limit.php | 4 ++--
core/DataTable/Filter/MetadataCallbackAddMetadata.php | 4 ++--
core/DataTable/Filter/Pattern.php | 4 ++--
core/DataTable/Filter/PatternRecursive.php | 4 ++--
core/DataTable/Filter/RangeCheck.php | 4 ++--
core/DataTable/Filter/ReplaceColumnNames.php | 4 ++--
core/DataTable/Filter/ReplaceSummaryRowLabel.php | 4 ++--
core/DataTable/Filter/SafeDecodeLabel.php | 4 ++--
core/DataTable/Filter/Sort.php | 4 ++--
core/DataTable/Filter/Truncate.php | 4 ++--
23 files changed, 48 insertions(+), 48 deletions(-)
rename core/DataTable/{Filter.php => BaseFilter.php} (95%)
diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
index 246b2c6f6d..988fd41bd5 100644
--- a/core/API/DataTableManipulator/ReportTotalsCalculator.php
+++ b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -13,7 +13,7 @@ namespace Piwik\API\DataTableManipulator;
use Piwik\API\DataTableManipulator;
use Piwik\DataTable;
use Piwik\DataTable\Row;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\Period\Range;
use Piwik\Period;
use Piwik\Piwik;
diff --git a/core/DataTable.php b/core/DataTable.php
index 7550bc4f25..aa97941971 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -14,7 +14,7 @@ namespace Piwik;
use Closure;
use Exception;
use Piwik\DataTable\DataTableInterface;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable\Manager;
use Piwik\DataTable\Renderer\Html;
use Piwik\DataTable\Row;
@@ -85,7 +85,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
* applied to DataTable\Map instances. So you can visit every DataTable in a {@link DataTable\Map}
* without having to write a recursive visiting function.
*
- * All predefined filters exist in the **Piwik\DataTable\Filter** namespace.
+ * All predefined filters exist in the **Piwik\DataTable\BaseFilter** namespace.
*
* _Note: For convenience, [anonymous functions](http://www.php.net/manual/en/functions.anonymous.php)
* can be used as DataTable filters._
@@ -255,7 +255,7 @@ class DataTable implements DataTableInterface
protected $tableSortedBy = false;
/**
- * List of Filter queued to this table
+ * List of BaseFilter queued to this table
*
* @var array
*/
@@ -399,7 +399,7 @@ class DataTable implements DataTableInterface
* to all subtables as well.
*
* @param string|Closure $className Class name, eg. `"Sort"` or "Piwik\DataTable\Filters\Sort"`. If no
- * namespace is supplied, `Piwik\DataTable\Filter` is assumed. This parameter
+ * namespace is supplied, `Piwik\DataTable\BaseFilter` is assumed. This parameter
* can also be a closure that takes a DataTable as its first parameter.
* @param array $parameters Array of extra parameters to pass to the filter.
*/
diff --git a/core/DataTable/Filter.php b/core/DataTable/BaseFilter.php
similarity index 95%
rename from core/DataTable/Filter.php
rename to core/DataTable/BaseFilter.php
index 99bcd08c85..29cbd7c3ab 100644
--- a/core/DataTable/Filter.php
+++ b/core/DataTable/BaseFilter.php
@@ -25,14 +25,14 @@ use Piwik\DataTable\Row;
* Filters are called with a DataTable instance and extra parameters that are specified
* in {@link Piwik\DataTable::filter()} and {@link Piwik\DataTable::queueFilter()}.
*
- * To see examples of Filters look at the existing ones in the Piwik\DataTable\Filter
+ * To see examples of Filters look at the existing ones in the Piwik\DataTable\BaseFilter
* namespace.
*
* @package Piwik
* @subpackage DataTable
* @api
*/
-abstract class Filter
+abstract class BaseFilter
{
/**
* @var bool
@@ -58,7 +58,7 @@ abstract class Filter
/**
* Enables/Disables recursive filtering. Whether this property is actually used
- * is up to the derived Filter class.
+ * is up to the derived BaseFilter class.
*
* @param bool $enable
*/
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index 53f555a274..39656ecc2d 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable\Row;
use Piwik\DataTable;
use Piwik\Metrics;
@@ -39,7 +39,7 @@ use Piwik\Metrics;
* @subpackage DataTable
* @api
*/
-class AddColumnsProcessedMetrics extends Filter
+class AddColumnsProcessedMetrics extends BaseFilter
{
protected $invalidDivision = 0;
protected $roundPrecision = 2;
diff --git a/core/DataTable/Filter/AddSummaryRow.php b/core/DataTable/Filter/AddSummaryRow.php
index 80bf0e8a94..26a1a4f3d2 100644
--- a/core/DataTable/Filter/AddSummaryRow.php
+++ b/core/DataTable/Filter/AddSummaryRow.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Row\DataTableSummaryRow;
@@ -28,7 +28,7 @@ use Piwik\DataTable\Row\DataTableSummaryRow;
* @subpackage DataTable
* @api
*/
-class AddSummaryRow extends Filter
+class AddSummaryRow extends BaseFilter
{
/**
* Constructor.
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumn.php b/core/DataTable/Filter/ColumnCallbackAddColumn.php
index d65d844e9c..0cbd4a8b06 100755
--- a/core/DataTable/Filter/ColumnCallbackAddColumn.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumn.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Adds a new column to every row of a {@link DataTable} based on the result of callback.
@@ -28,7 +28,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class ColumnCallbackAddColumn extends Filter
+class ColumnCallbackAddColumn extends BaseFilter
{
/**
* The names of the columns to pass to the callback.
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
index 47d3825cb5..db673db2e4 100644
--- a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
@@ -29,7 +29,7 @@ use Piwik\DataTable\Row;
* @subpackage DataTable
* @api
*/
-class ColumnCallbackAddColumnQuotient extends Filter
+class ColumnCallbackAddColumnQuotient extends BaseFilter
{
protected $table;
protected $columnValueToRead;
diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
index f9a092457f..2e0bf833d4 100644
--- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php
+++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Executes a callback for each row of a {@link DataTable} and adds the result as a new
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class ColumnCallbackAddMetadata extends Filter
+class ColumnCallbackAddMetadata extends BaseFilter
{
private $columnsToRead;
private $functionToApply;
diff --git a/core/DataTable/Filter/ColumnCallbackDeleteRow.php b/core/DataTable/Filter/ColumnCallbackDeleteRow.php
index cab41a039d..7a01cbed58 100644
--- a/core/DataTable/Filter/ColumnCallbackDeleteRow.php
+++ b/core/DataTable/Filter/ColumnCallbackDeleteRow.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Deletes all rows for which a callback returns true.
@@ -27,7 +27,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class ColumnCallbackDeleteRow extends Filter
+class ColumnCallbackDeleteRow extends BaseFilter
{
private $columnToFilter;
private $function;
diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php
index 2b56276d1c..4bd1619e0c 100644
--- a/core/DataTable/Filter/ColumnCallbackReplace.php
+++ b/core/DataTable/Filter/ColumnCallbackReplace.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
@@ -34,7 +34,7 @@ use Piwik\DataTable\Row;
* @package Piwik
* @subpackage DataTable
*/
-class ColumnCallbackReplace extends Filter
+class ColumnCallbackReplace extends BaseFilter
{
private $columnsToFilter;
private $functionToApply;
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index 9a63f2b735..17bbe0cb82 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Filter that will remove columns from a {@link DataTable} using either a blacklist,
@@ -31,7 +31,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class ColumnDelete extends Filter
+class ColumnDelete extends BaseFilter
{
/**
* The columns that should be removed from DataTable rows.
diff --git a/core/DataTable/Filter/ExcludeLowPopulation.php b/core/DataTable/Filter/ExcludeLowPopulation.php
index e998aa321d..168217ae8c 100644
--- a/core/DataTable/Filter/ExcludeLowPopulation.php
+++ b/core/DataTable/Filter/ExcludeLowPopulation.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Deletes all rows for which a specific column has a value that is lower than
@@ -35,7 +35,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class ExcludeLowPopulation extends Filter
+class ExcludeLowPopulation extends BaseFilter
{
const MINIMUM_SIGNIFICANT_PERCENTAGE_THRESHOLD = 0.02;
diff --git a/core/DataTable/Filter/GroupBy.php b/core/DataTable/Filter/GroupBy.php
index 0eef76c0d1..28aec21f2f 100755
--- a/core/DataTable/Filter/GroupBy.php
+++ b/core/DataTable/Filter/GroupBy.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* DataTable filter that will group {@link DataTable} rows together based on the results
@@ -30,7 +30,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class GroupBy extends Filter
+class GroupBy extends BaseFilter
{
/**
* The name of the columns to reduce.
diff --git a/core/DataTable/Filter/Limit.php b/core/DataTable/Filter/Limit.php
index dd990223d6..f6ed744653 100644
--- a/core/DataTable/Filter/Limit.php
+++ b/core/DataTable/Filter/Limit.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Delete all rows from the table that are not in the given [offset, offset+limit) range.
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class Limit extends Filter
+class Limit extends BaseFilter
{
/**
* Constructor.
diff --git a/core/DataTable/Filter/MetadataCallbackAddMetadata.php b/core/DataTable/Filter/MetadataCallbackAddMetadata.php
index b9a88b08b3..f713031113 100644
--- a/core/DataTable/Filter/MetadataCallbackAddMetadata.php
+++ b/core/DataTable/Filter/MetadataCallbackAddMetadata.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Executes a callback for each row of a {@link DataTable} and adds the result to the
@@ -26,7 +26,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class MetadataCallbackAddMetadata extends Filter
+class MetadataCallbackAddMetadata extends BaseFilter
{
private $metadataToRead;
private $functionToApply;
diff --git a/core/DataTable/Filter/Pattern.php b/core/DataTable/Filter/Pattern.php
index 95875a0046..6619fe4134 100644
--- a/core/DataTable/Filter/Pattern.php
+++ b/core/DataTable/Filter/Pattern.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Deletes every row for which a specific column does not match a supplied regex pattern.
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
* @subpackage DataTable
* @api
*/
-class Pattern extends Filter
+class Pattern extends BaseFilter
{
private $columnToFilter;
private $patternToSearch;
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 0970a1d29e..1a82384d5e 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Exception;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Manager;
@@ -28,7 +28,7 @@ use Piwik\DataTable\Manager;
* @subpackage DataTable
* @api
*/
-class PatternRecursive extends Filter
+class PatternRecursive extends BaseFilter
{
private $columnToFilter;
private $patternToSearch;
diff --git a/core/DataTable/Filter/RangeCheck.php b/core/DataTable/Filter/RangeCheck.php
index bac24d4acc..a5005b2bfd 100644
--- a/core/DataTable/Filter/RangeCheck.php
+++ b/core/DataTable/Filter/RangeCheck.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Check range
@@ -19,7 +19,7 @@ use Piwik\DataTable\Filter;
* @package Piwik
* @subpackage DataTable
*/
-class RangeCheck extends Filter
+class RangeCheck extends BaseFilter
{
static public $minimumValue = 0.00;
static public $maximumValue = 100.0;
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index 02c8f9f500..7476616558 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable\Simple;
use Piwik\DataTable;
use Piwik\Metrics;
@@ -41,7 +41,7 @@ use Piwik\Tracker\GoalManager;
* @subpackage DataTable
* @api
*/
-class ReplaceColumnNames extends Filter
+class ReplaceColumnNames extends BaseFilter
{
protected $mappingToApply;
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index bb1d15df46..9e3c983850 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Manager;
use Piwik\Piwik;
@@ -32,7 +32,7 @@ use Piwik\Piwik;
* @subpackage DataTable
* @api
*/
-class ReplaceSummaryRowLabel extends Filter
+class ReplaceSummaryRowLabel extends BaseFilter
{
/**
* Constructor.
diff --git a/core/DataTable/Filter/SafeDecodeLabel.php b/core/DataTable/Filter/SafeDecodeLabel.php
index b573fc9a95..9b658f9013 100644
--- a/core/DataTable/Filter/SafeDecodeLabel.php
+++ b/core/DataTable/Filter/SafeDecodeLabel.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
/**
* Sanitizes DataTable labels as an extra precaution. Called internally by Piwik.
@@ -19,7 +19,7 @@ use Piwik\DataTable\Filter;
* @package Piwik
* @subpackage DataTable
*/
-class SafeDecodeLabel extends Filter
+class SafeDecodeLabel extends BaseFilter
{
private $columnToDecode;
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 16ebd80dc4..7a58a877ae 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
use Piwik\DataTable;
@@ -25,7 +25,7 @@ use Piwik\Metrics;
* @subpackage DataTable
* @api
*/
-class Sort extends Filter
+class Sort extends BaseFilter
{
protected $columnToSort;
protected $order;
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 5896048a6a..bf7d71fe2c 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
use Piwik\Piwik;
@@ -35,7 +35,7 @@ use Piwik\Piwik;
* @subpackage DataTable
* @api
*/
-class Truncate extends Filter
+class Truncate extends BaseFilter
{
/**
* Constructor.
--
GitLab