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/API/DataTableManipulator/Flattener.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/API/DataTableManipulator/Flattener.php')
-rw-r--r-- | core/API/DataTableManipulator/Flattener.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php index 4f700ac854..6ccae47fdd 100644 --- a/core/API/DataTableManipulator/Flattener.php +++ b/core/API/DataTableManipulator/Flattener.php @@ -8,6 +8,8 @@ * @category Piwik * @package Piwik */ +use Piwik\DataTable; +use Piwik\DataTable\Row; /** * This class is responsible for flattening data tables. @@ -40,8 +42,8 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu public $recursiveLabelSeparator = ' - '; /** - * @param Piwik_DataTable $dataTable - * @return Piwik_DataTable|Piwik_DataTable_Array + * @param DataTable $dataTable + * @return DataTable|DataTable\Map */ public function flatten($dataTable) { @@ -56,8 +58,8 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu * Template method called from self::manipulate. * Flatten each data table. * - * @param Piwik_DataTable $dataTable - * @return Piwik_DataTable + * @param DataTable $dataTable + * @return DataTable */ protected function manipulateDataTable($dataTable) { @@ -73,12 +75,12 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu } /** - * @param Piwik_DataTable_Row $row - * @param Piwik_DataTable $dataTable + * @param Row $row + * @param DataTable $dataTable * @param string $labelPrefix * @param bool $parentLogo */ - private function flattenRow(Piwik_DataTable_Row $row, Piwik_DataTable $dataTable, + private function flattenRow(Row $row, DataTable $dataTable, $labelPrefix = '', $parentLogo = false) { $label = $row->getColumn('label'); |