diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:35 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:36 +0400 |
commit | aca8ec33a85e0a70b818b6227145041717d7a69e (patch) | |
tree | 41377e3a9737d63222522ef93ecf8483f3faddfa /core/DataTable/Filter.php | |
parent | 0a63210e3eae7562af1a3dbee340eb1ee140db3d (diff) |
Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.
Removed some deprecated code.
Diffstat (limited to 'core/DataTable/Filter.php')
-rw-r--r-- | core/DataTable/Filter.php | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/core/DataTable/Filter.php b/core/DataTable/Filter.php index 455c5aa6e7..43cb33f2a0 100644 --- a/core/DataTable/Filter.php +++ b/core/DataTable/Filter.php @@ -8,6 +8,12 @@ * @category Piwik * @package Piwik */ +namespace Piwik\DataTable; + +use Exception; +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Row; /** * A filter is applied instantly to a given DataTable and can @@ -21,9 +27,9 @@ * and can do whatever is necessary on the data (in the filter() method). * * @package Piwik - * @subpackage Piwik_DataTable + * @subpackage DataTable */ -abstract class Piwik_DataTable_Filter +abstract class Filter { /** * @var bool @@ -32,19 +38,19 @@ abstract class Piwik_DataTable_Filter /** * @throws Exception - * @param Piwik_DataTable $table + * @param DataTable $table */ public function __construct($table) { - if (!($table instanceof Piwik_DataTable)) { - throw new Exception("The filter accepts only a Piwik_DataTable object."); + if (!($table instanceof DataTable)) { + throw new Exception("The filter accepts only a DataTable object."); } } /** * Filters the given data table * - * @param Piwik_DataTable $table + * @param DataTable $table */ abstract public function filter($table); @@ -61,16 +67,16 @@ abstract class Piwik_DataTable_Filter /** * Filters a subtable * - * @param Piwik_DataTable_Row $row + * @param Row $row * @return mixed */ - public function filterSubTable(Piwik_DataTable_Row $row) + public function filterSubTable(Row $row) { if (!$this->enableRecursive) { return; } if ($row->isSubtableLoaded()) { - $subTable = Piwik_DataTable_Manager::getInstance()->getTable($row->getIdSubDataTable()); + $subTable = Manager::getInstance()->getTable($row->getIdSubDataTable()); $this->filter($subTable); } } |