diff options
32 files changed, 216 insertions, 213 deletions
diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php index 111453520c..4c80f3e83d 100644 --- a/core/API/DataTableGenericFilter.php +++ b/core/API/DataTableGenericFilter.php @@ -106,7 +106,7 @@ class DataTableGenericFilter protected function applyGenericFilters($datatable) { if ($datatable instanceof DataTable\Map) { - $tables = $datatable->getArray(); + $tables = $datatable->getDataTables(); $filterWasApplied = false; foreach ($tables as $table) { $filterWasApplied = $this->applyGenericFilters($table); diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php index 9e5d3d9868..418ef7aed5 100644 --- a/core/API/DataTableManipulator.php +++ b/core/API/DataTableManipulator.php @@ -67,7 +67,7 @@ abstract class DataTableManipulator protected function manipulate($dataTable) { if ($dataTable instanceof DataTable\Map) { - return $this->manipulateDataTableArray($dataTable); + return $this->manipulateDataTableMap($dataTable); } else if ($dataTable instanceof DataTable) { return $this->manipulateDataTable($dataTable); } else { @@ -76,15 +76,15 @@ abstract class DataTableManipulator } /** - * Manipulates child DataTables of a DataTable_Array. See @manipulate for more info. + * Manipulates child DataTables of a DataTable\Map. See @manipulate for more info. * * @param DataTable\Map $dataTable * @return DataTable\Map */ - protected function manipulateDataTableArray($dataTable) + protected function manipulateDataTableMap($dataTable) { $result = $dataTable->getEmptyClone(); - foreach ($dataTable->getArray() as $tableLabel => $childTable) { + foreach ($dataTable->getDataTables() as $tableLabel => $childTable) { $newTable = $this->manipulate($childTable); $result->addTable($newTable, $tableLabel); } diff --git a/core/Archive.php b/core/Archive.php index 5e5cef30d6..d4fa564dda 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -218,7 +218,7 @@ class Archive * @param string|array $names One or more archive names, eg, 'nb_visits', 'Referers_distinctKeywords', * etc. * @return DataTable|DataTable\Map|bool False if no value with the given names. Based on the number - * of sites/periods, the result can be a DataTable_Array, which + * of sites/periods, the result can be a DataTable\Map, which * contains DataTable instances. */ public function getDataTableFromNumeric($names) diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php index c1ade2b98f..a21a4ed463 100644 --- a/core/Archive/DataTableFactory.php +++ b/core/Archive/DataTableFactory.php @@ -149,7 +149,7 @@ class DataTableFactory $dataTable = $this->createDataTable($index, $keyMetadata = array()); } else { - $dataTable = $this->createDataTableArrayFromIndex($index, $resultIndices); + $dataTable = $this->createDataTableMapFromIndex($index, $resultIndices); } $this->transformMetadata($dataTable); @@ -247,7 +247,7 @@ class DataTableFactory * @param array $keyMetadata The metadata to add to the table when it's created. * @return DataTable\Map */ - private function createDataTableArrayFromIndex($index, $resultIndices, $keyMetadata = array()) + private function createDataTableMapFromIndex($index, $resultIndices, $keyMetadata = array()) { $resultIndexLabel = reset($resultIndices); $resultIndex = key($resultIndices); @@ -263,7 +263,7 @@ class DataTableFactory if (empty($resultIndices)) { $newTable = $this->createDataTable($value, $keyMetadata); } else { - $newTable = $this->createDataTableArrayFromIndex($value, $resultIndices, $keyMetadata); + $newTable = $this->createDataTableMapFromIndex($value, $resultIndices, $keyMetadata); } $result->addTable($newTable, $this->prettifyIndexLabel($resultIndex, $label)); diff --git a/core/ArchiveProcessor/Period.php b/core/ArchiveProcessor/Period.php index d87d928f86..b621cf401a 100644 --- a/core/ArchiveProcessor/Period.php +++ b/core/ArchiveProcessor/Period.php @@ -166,7 +166,7 @@ class Period extends ArchiveProcessor $data = $this->archiver->getDataTableExpanded($name, $idSubTable = null, $depth = null, $addMetadataSubtableId = false); if ($data instanceof DataTable\Map) { - foreach ($data->getArray() as $date => $tableToSum) { + foreach ($data->getDataTables() as $date => $tableToSum) { $table->addDataTable($tableToSum); } } else { diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php index ea35f0365d..c8715c710a 100644 --- a/core/DataTable/Map.php +++ b/core/DataTable/Map.php @@ -13,8 +13,8 @@ use Piwik\DataTable; use Piwik\DataTable\Renderer\Console; /** - * The DataTable_Array is a way to store an array of dataTable. - * The Set implements some of the features of the DataTable such as queueFilter, getRowsCount. + * The DataTable Map is a way to store an array of dataTable. + * The Map implements some of the features of the DataTable such as queueFilter, getRowsCount. * * @package Piwik * @subpackage DataTable @@ -61,34 +61,34 @@ class Map } /** - * Returns the number of DataTable in this DataTable_Array + * Returns the number of DataTable in this DataTable\Map * * @return int */ public function getRowsCount() { - return count($this->array); + return count($this->getDataTables()); } /** - * Queue a filter to the DataTable_Array will queue this filter to every DataTable of the DataTable_Array. + * Queue a filter to the DataTable\Map will queue this filter to every DataTable of the DataTable\Map. * * @param string $className Filter name, eg. Limit * @param array $parameters Filter parameters, eg. array( 50, 10 ) */ public function queueFilter($className, $parameters = array()) { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->queueFilter($className, $parameters); } } /** - * Apply the filters previously queued to each of the DataTable of this DataTable_Array. + * Apply the filters previously queued to each of the DataTable of this DataTable\Map. */ public function applyQueuedFilters() { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->applyQueuedFilters(); } } @@ -101,7 +101,7 @@ class Map */ public function filter($className, $parameters = array()) { - foreach ($this->array as $id => $table) { + foreach ($this->getDataTables() as $id => $table) { $table->filter($className, $parameters); } } @@ -111,7 +111,7 @@ class Map * * @return DataTable[] */ - public function getArray() + public function getDataTables() { return $this->array; } @@ -129,13 +129,13 @@ class Map /** * Returns the first row - * This method can be used to treat DataTable and DataTable_Array in the same way + * This method can be used to treat DataTable and DataTable\Map in the same way * * @return Row */ public function getFirstRow() { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $row = $table->getFirstRow(); if ($row !== false) { return $row; @@ -145,7 +145,7 @@ class Map } /** - * Adds a new DataTable to the DataTable_Array + * Adds a new DataTable to the DataTable\Map * * @param DataTable $table * @param string $label Label used to index this table in the array @@ -156,8 +156,8 @@ class Map } /** - * Returns a string output of this DataTable_Array (applying the default renderer to every DataTable - * of this DataTable_Array). + * Returns a string output of this DataTable\Map (applying the default renderer to every DataTable + * of this DataTable\Map). * * @return string */ @@ -173,7 +173,7 @@ class Map */ public function enableRecursiveSort() { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->enableRecursiveSort(); } } @@ -187,7 +187,7 @@ class Map */ public function renameColumn($oldName, $newName) { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->renameColumn($oldName, $newName); } } @@ -200,14 +200,14 @@ class Map */ public function deleteColumns($columns) { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->deleteColumns($columns); } } public function deleteRow($id) { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->deleteRow($id); } } @@ -220,7 +220,7 @@ class Map */ public function deleteColumn($column) { - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $table->deleteColumn($column); } } @@ -234,7 +234,7 @@ class Map public function getColumn($name) { $values = array(); - foreach ($this->array as $table) { + foreach ($this->getDataTables() as $table) { $moreValues = $table->getColumn($name); foreach ($moreValues as &$value) { $values[] = $value; @@ -249,7 +249,7 @@ class Map * to the label of the DataTable they were originally from. * * The result of this function is determined by the type of DataTable - * this instance holds. If this DataTable_Array instance holds an array + * this instance holds. If this DataTable\Map instance holds an array * of DataTables, this function will transform it from: * <code> * Label 0: @@ -262,11 +262,11 @@ class Map * DataTable(row1[label = 'Label 0'], row2[label = 'Label 1']) * </code> * - * If this instance holds an array of DataTable_Arrays, this function will + * If this instance holds an array of DataTable\Maps, this function will * transform it from: * <code> - * Outer Label 0: // the outer DataTable_Array - * Inner Label 0: // one of the inner DataTable_Arrays + * Outer Label 0: // the outer DataTable\Map + * Inner Label 0: // one of the inner DataTable\Maps * DataTable(row1) * Inner Label 1: * DataTable(row2) @@ -284,7 +284,7 @@ class Map * DataTable(row2[label = 'Outer Label 0'], row4[label = 'Outer Label 1']) * </code> * - * In addition, if this instance holds an array of DataTable_Arrays, the + * In addition, if this instance holds an array of DataTable\Maps, the * metadata of the first child is used as the metadata of the result. * * This function can be used, for example, to smoosh IndexedBySite archive @@ -299,8 +299,9 @@ class Map if ($firstChild instanceof Map) { $result = $firstChild->getEmptyClone(); - foreach ($this->array as $label => $subTableArray) { - foreach ($subTableArray->array as $innerLabel => $subTable) { + /** @var $subTableArray Map */ + foreach ($this->getDataTables() as $label => $subTableArray) { + foreach ($subTableArray->getDataTables() as $innerLabel => $subTable) { if (!isset($result->array[$innerLabel])) { $dataTable = new DataTable(); $dataTable->metadata = $subTable->metadata; @@ -314,7 +315,7 @@ class Map } else { $result = new DataTable(); - foreach ($this->array as $label => $subTable) { + foreach ($this->getDataTables() as $label => $subTable) { $this->copyRowsAndSetLabel($result, $subTable, $label); } } @@ -354,7 +355,7 @@ class Map */ public function addDataTable(DataTable $tableToSum) { - foreach ($this->getArray() as $childTable) { + foreach ($this->getDataTables() as $childTable) { if ($childTable->getRowsCount() > 0) { $childTable->addDataTable($tableToSum); } @@ -362,7 +363,7 @@ class Map } /** - * Returns a new DataTable_Array w/ child tables that have had their + * Returns a new DataTable\Map w/ child tables that have had their * subtables merged. * * @see DataTable::mergeSubtables @@ -372,23 +373,23 @@ class Map public function mergeSubtables() { $result = $this->getEmptyClone(); - foreach ($this->array as $label => $childTable) { + foreach ($this->getDataTables() as $label => $childTable) { $result->addTable($childTable->mergeSubtables(), $label); } return $result; } /** - * Returns a new DataTable_Array w/o any child DataTables, but with + * Returns a new DataTable\Map w/o any child DataTables, but with * the same key name as this instance. * * @return Map */ public function getEmptyClone() { - $newTableArray = new Map; - $newTableArray->setKeyName($this->getKeyName()); - return $newTableArray; + $dataTableMap = new Map; + $dataTableMap->setKeyName($this->getKeyName()); + return $dataTableMap; } /** @@ -400,7 +401,7 @@ class Map public function getMetadataIntersectArray($name) { $data = array(); - foreach ($this->getArray() as $childTable) { + foreach ($this->getDataTables() as $childTable) { $childData = $childTable->getMetadata($name); if (is_array($childData)) { $data = array_intersect($data, $childData); @@ -416,7 +417,7 @@ class Map */ public function getColumns() { - foreach ($this->getArray() as $childTable) { + foreach ($this->getDataTables() as $childTable) { if ($childTable->getRowsCount() > 0) { return $childTable->getColumns(); } diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index fe70f9e28f..2872889f6f 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -153,7 +153,7 @@ abstract class Renderer && !($table instanceof DataTable) && !($table instanceof DataTable\Map) ) { - throw new Exception("DataTable renderers renderer accepts only DataTable and Set instances, and array instances."); + throw new Exception("DataTable renderers renderer accepts only DataTable and Map instances, and arrays."); } $this->table = $table; } diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php index 594c80427f..b13f57a159 100644 --- a/core/DataTable/Renderer/Console.php +++ b/core/DataTable/Renderer/Console.php @@ -69,11 +69,11 @@ class Console extends Renderer * @param string $prefix prefix to output before table data * @return string */ - protected function renderDataTableArray(DataTable\Map $tableArray, $prefix) + protected function renderDataTableMap(DataTable\Map $tableArray, $prefix) { $output = "Set<hr />"; $prefix = $prefix . ' '; - foreach ($tableArray->getArray() as $descTable => $table) { + foreach ($tableArray->getDataTables() as $descTable => $table) { $output .= $prefix . "<b>" . $descTable . "</b><br />"; $output .= $prefix . $this->renderTable($table, $prefix . ' '); $output .= "<hr />"; @@ -96,7 +96,7 @@ class Console extends Renderer } if ($table instanceof DataTable\Map) { - return $this->renderDataTableArray($table, $prefix); + return $this->renderDataTableMap($table, $prefix); } if ($table->getRowsCount() == 0) { @@ -107,12 +107,12 @@ class Console extends Renderer $output = ''; $i = 1; foreach ($table->getRows() as $row) { - $dataTableArrayBreak = false; + $dataTableMapBreak = false; $columns = array(); foreach ($row->getColumns() as $column => $value) { if ($value instanceof DataTable\Map) { - $output .= $this->renderDataTableArray($value, $prefix); - $dataTableArrayBreak = true; + $output .= $this->renderDataTableMap($value, $prefix); + $dataTableMapBreak = true; break; } if (is_string($value)) $value = "'$value'"; @@ -120,7 +120,7 @@ class Console extends Renderer $columns[] = "'$column' => $value"; } - if ($dataTableArrayBreak === true) { + if ($dataTableMapBreak === true) { continue; } $columns = implode(", ", $columns); diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index e1f4556025..692c61d8ef 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -137,7 +137,7 @@ class Csv extends Renderer } if ($table instanceof DataTable\Map) { - $str = $this->renderDataTableArray($table, $allColumns); + $str = $this->renderDataTableMap($table, $allColumns); } else { $str = $this->renderDataTable($table, $allColumns); } @@ -151,10 +151,10 @@ class Csv extends Renderer * @param array $allColumns * @return string */ - protected function renderDataTableArray($table, &$allColumns = array()) + protected function renderDataTableMap($table, &$allColumns = array()) { $str = ''; - foreach ($table->getArray() as $currentLinePrefix => $dataTable) { + foreach ($table->getDataTables() as $currentLinePrefix => $dataTable) { $returned = explode("\n", $this->renderTable($dataTable, $allColumns)); // get rid of the columns names diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php index 5d7d291df7..a13921b057 100644 --- a/core/DataTable/Renderer/Html.php +++ b/core/DataTable/Renderer/Html.php @@ -87,7 +87,7 @@ class Html extends Renderer } if ($table instanceof DataTable\Map) { - foreach ($table->getArray() as $date => $subtable) { + foreach ($table->getDataTables() as $date => $subtable) { if ($subtable->getRowsCount()) { $this->buildTableStructure($subtable, '_' . $table->getKeyName(), $date); } diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php index 3d8ca301e1..59f3b45a01 100644 --- a/core/DataTable/Renderer/Php.php +++ b/core/DataTable/Renderer/Php.php @@ -139,7 +139,7 @@ class Php extends Renderer } } else if ($dataTable instanceof DataTable\Map) { $flatArray = array(); - foreach ($dataTable->getArray() as $keyName => $table) { + foreach ($dataTable->getDataTables() as $keyName => $table) { $serializeSave = $this->serialize; $this->serialize = false; $flatArray[$keyName] = $this->flatRender($table); diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php index a0be968af9..2e3e3265bc 100644 --- a/core/DataTable/Renderer/Rss.php +++ b/core/DataTable/Renderer/Rss.php @@ -72,7 +72,7 @@ class Rss extends Renderer $piwikUrl = Url::getCurrentUrlWithoutFileName() . "?module=CoreHome&action=index&idSite=" . $idSite . "&period=" . $period; $out = ""; - $moreRecentFirst = array_reverse($table->getArray(), true); + $moreRecentFirst = array_reverse($table->getDataTables(), true); foreach ($moreRecentFirst as $date => $subtable) { /** @var DataTable $subtable */ $timestamp = $subtable->getMetadata('period')->getDateStart()->getTimestamp(); diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index 86cc9d8aa6..cabfb50f62 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -93,7 +93,7 @@ class Xml extends Renderer { $array = $this->getArrayFromDataTable($table); if ($table instanceof Map) { - $out = $this->renderDataTableArray($table, $array, $prefixLines); + $out = $this->renderDataTableMap($table, $array, $prefixLines); if ($returnOnlyDataTableXml) { return $out; @@ -213,7 +213,7 @@ class Xml extends Renderer } else { $result .= $prefixLines . $prefix . "\n"; if ($value instanceof Map) { - $result .= $this->renderDataTableArray($value, $this->getArrayFromDataTable($value), $prefixLines); + $result .= $this->renderDataTableMap($value, $this->getArrayFromDataTable($value), $prefixLines); } else if ($value instanceof Simple) { $result .= $this->renderDataTableSimple($this->getArrayFromDataTable($value), $prefixLines); } else { @@ -244,7 +244,7 @@ class Xml extends Renderer * @param string $prefixLines * @return string */ - protected function renderDataTableArray($table, $array, $prefixLines = "") + protected function renderDataTableMap($table, $array, $prefixLines = "") { // CASE 1 //array @@ -268,7 +268,7 @@ class Xml extends Renderer return $xml; } - $subTables = $table->getArray(); + $subTables = $table->getDataTables(); $firstTable = current($subTables); // CASE 2 @@ -341,7 +341,7 @@ class Xml extends Renderer if ($firstTable instanceof Map) { $xml = ''; - $tables = $table->getArray(); + $tables = $table->getDataTables(); $nameDescriptionAttribute = $table->getKeyName(); foreach ($tables as $valueAttribute => $tableInArray) { $out = $this->renderTable($tableInArray, true, $prefixLines . "\t"); diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index f5157ea00f..5d6a6f5c89 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -554,7 +554,7 @@ class ViewDataTable } /** - * Checks that the API returned a normal DataTable (as opposed to DataTable_Array) + * Checks that the API returned a normal DataTable (as opposed to DataTable\Map) * @throws \Exception * @return void */ diff --git a/core/ViewDataTable/Sparkline.php b/core/ViewDataTable/Sparkline.php index c3fd116114..3cb2772319 100644 --- a/core/ViewDataTable/Sparkline.php +++ b/core/ViewDataTable/Sparkline.php @@ -72,17 +72,17 @@ class Sparkline extends ViewDataTable } /** - * @param DataTable\Map $dataTableArray + * @param DataTable\Map $dataTableMap * @param string $columnToPlot * * @return array * @throws \Exception */ - protected function getValuesFromDataTableArray($dataTableArray, $columnToPlot) + protected function getValuesFromDataTableMap($dataTableMap, $columnToPlot) { - $dataTableArray->applyQueuedFilters(); + $dataTableMap->applyQueuedFilters(); $values = array(); - foreach ($dataTableArray->getArray() as $table) { + foreach ($dataTableMap->getDataTables() as $table) { if ($table->getRowsCount() > 1) { throw new Exception("Expecting only one row per DataTable"); } @@ -114,7 +114,7 @@ class Sparkline extends ViewDataTable // a Set is returned when using the normal code path to request data from Archives, in all core plugins // however plugins can also return simple datatable, hence why the sparkline can accept both data types if ($this->dataTable instanceof DataTable\Map) { - $values = $this->getValuesFromDataTableArray($dataTable, $columnToPlot); + $values = $this->getValuesFromDataTableMap($dataTable, $columnToPlot); } elseif ($this->dataTable instanceof DataTable) { $values = $this->dataTable->getColumn($columnToPlot); } diff --git a/plugins/API/API.php b/plugins/API/API.php index 060a003fe5..10dc43fb18 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -443,7 +443,7 @@ class API $params['columns'] = implode(',', $columns); $dataTable = Proxy::getInstance()->call($className, 'get', $params); // make sure the table has all columns - $array = ($dataTable instanceof DataTable\Map ? $dataTable->getArray() : array($dataTable)); + $array = ($dataTable instanceof DataTable\Map ? $dataTable->getDataTables() : array($dataTable)); foreach ($array as $table) { // we don't support idSites=all&date=DATE1,DATE2 if ($table instanceof DataTable) { @@ -478,8 +478,8 @@ class API { // handle table arrays if ($table1 instanceof DataTable\Map && $table2 instanceof DataTable\Map) { - $subTables2 = $table2->getArray(); - foreach ($table1->getArray() as $index => $subTable1) { + $subTables2 = $table2->getDataTables(); + foreach ($table1->getDataTables() as $index => $subTable1) { $subTable2 = $subTables2[$index]; $this->mergeDataTables($subTable1, $subTable2); } diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 0c965e7cc7..913ee3237b 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -373,7 +373,7 @@ class ProcessedReport $rowsMetadata->setKeyName("prettyDate"); // Process each Simple entry - foreach ($dataTable->getArray() as $label => $simpleDataTable) { + foreach ($dataTable->getDataTables() as $label => $simpleDataTable) { $this->removeEmptyColumns($columns, $reportMetadata, $simpleDataTable); list($enhancedSimpleDataTable, $rowMetadata) = $this->handleSimpleDataTable($idSite, $simpleDataTable, $columns, $hasDimension, $showRawMetrics); diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index a565424763..cc1e6461c1 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -87,7 +87,7 @@ class RowEvolution { // set label index metadata $labelsToIndex = array_flip($labels); - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { foreach ($table->getRows() as $row) { $label = $row->getColumn('label'); if (isset($labelsToIndex[$label])) { @@ -106,7 +106,7 @@ class RowEvolution protected function getLabelsFromDataTable($dataTable, $labels) { // if no labels specified, use all possible labels as list - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { $labels = array_merge($labels, $table->getColumn('label')); } $labels = array_values(array_unique($labels)); @@ -138,7 +138,7 @@ class RowEvolution $logo = $actualLabel = false; $urlFound = false; - foreach ($dataTable->getArray() as $date => $subTable) { + foreach ($dataTable->getDataTables() as $date => $subTable) { /** @var $subTable DataTable */ $subTable->applyQueuedFilters(); if ($subTable->getRowsCount() > 0) { @@ -331,7 +331,7 @@ class RowEvolution } unset($metadata['logos']); - $subDataTables = $dataTable->getArray(); + $subDataTables = $dataTable->getDataTables(); $firstDataTable = reset($subDataTables); $firstDataTableRow = $firstDataTable->getFirstRow(); $lastDataTable = end($subDataTables); @@ -381,7 +381,7 @@ class RowEvolution } /** Get row evolution for a multiple labels */ - private function getMultiRowEvolution($dataTable, $metadata, $apiModule, $apiAction, $labels, $column, + private function getMultiRowEvolution(DataTable\Map $dataTable, $metadata, $apiModule, $apiAction, $labels, $column, $legendAppendMetric = true, $labelUseAbsoluteUrl = true) { @@ -394,7 +394,7 @@ class RowEvolution // get the processed label and logo (if any) for every requested label $actualLabels = $logos = array(); foreach ($labels as $labelIdx => $label) { - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { $labelRow = $this->getRowEvolutionRowFromLabelIdx($table, $labelIdx); if ($labelRow) { @@ -417,7 +417,7 @@ class RowEvolution // convert rows to be array($column.'_'.$labelIdx => $value) as opposed to // array('label' => $label, 'column' => $value). $dataTableMulti = $dataTable->getEmptyClone(); - foreach ($dataTable->getArray() as $tableLabel => $table) { + foreach ($dataTable->getDataTables() as $tableLabel => $table) { $newRow = new Row(); foreach ($labels as $labelIdx => $label) { diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index aaad454f0e..534ed6a46d 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -353,8 +353,8 @@ class API if ($customVariables instanceof DataTable\Map) { $dataTable = $customVariables->getEmptyClone(); - $customVariableDatatables = $customVariables->getArray(); - $dataTables = $dataTable->getArray(); + $customVariableDatatables = $customVariables->getDataTables(); + $dataTables = $dataTable->getDataTables(); foreach ($customVariableDatatables as $key => $customVariableTableForDate) { // we do not enter the IF, in the case idSite=1,3 AND period=day&date=datefrom,dateto, if (isset($customVariableTableForDate->metadata['period'])) { @@ -412,7 +412,7 @@ class API // if an array occurs inside the nested table, we only look for the first match (see below) $newTableArray = $table->getEmptyClone(); - foreach ($table->getArray() as $label => $subTable) { + foreach ($table->getDataTables() as $label => $subTable) { $newSubTable = $this->doFilterPageDatatableSearch($callBackParameters, $subTable, $searchTree); $newTableArray->addTable($newSubTable, $label); @@ -432,7 +432,7 @@ class API { // filter a data table array if ($table instanceof DataTable\Map) { - foreach ($table->getArray() as $subTable) { + foreach ($table->getDataTables() as $subTable) { $filteredSubTable = $this->doFilterPageDatatableSearch($callBackParameters, $subTable, $searchTree); if ($filteredSubTable->getRowsCount() > 0) { diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php index 13b36416b8..6c033a9c40 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php @@ -39,7 +39,7 @@ class Evolution extends JqplotDataGenerator // the X label is extracted from the 'period' object in the table's metadata $xLabels = array(); - foreach ($dataTable->getArray() as $metadataDataTable) { + foreach ($dataTable->getDataTables() as $metadataDataTable) { $xLabels[] = $metadataDataTable->getMetadata('period')->getLocalizedShortString(); // eg. "Aug 2009" } @@ -71,7 +71,7 @@ class Evolution extends JqplotDataGenerator $visualization->setAxisYValues($allSeriesData); $visualization->setAxisYUnits($seriesUnits); - $dataTables = $dataTable->getArray(); + $dataTables = $dataTable->getDataTables(); if ($this->isLinkEnabled()) { $idSite = Common::getRequestVar('idSite', null, 'int'); @@ -79,7 +79,7 @@ class Evolution extends JqplotDataGenerator $axisXOnClick = array(); $queryStringAsHash = $this->getQueryStringAsHash(); - foreach ($dataTable->getArray() as $idDataTable => $metadataDataTable) { + foreach ($dataTable->getDataTables() as $idDataTable => $metadataDataTable) { $dateInUrl = $metadataDataTable->getMetadata('period')->getDateStart(); $parameters = array( 'idSite' => $idSite, @@ -103,10 +103,10 @@ class Evolution extends JqplotDataGenerator } } - private function getSeriesData($rowLabel, $columnName, $dataTable) + private function getSeriesData($rowLabel, $columnName, DataTable\Map $dataTable) { $seriesData = array(); - foreach ($dataTable->getArray() as $childTable) { + foreach ($dataTable->getDataTables() as $childTable) { // get the row for this label (use the first if $rowLabel is false) if ($rowLabel === false) { $row = $childTable->getFirstRow(); diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 327e643405..1fbdc79bff 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -260,8 +260,8 @@ class API // Handle case where date=last30&period=day if ($customVariables instanceof DataTable\Map) { - $customVariableDatatables = $customVariables->getArray(); - $dataTables = $dataTable->getArray(); + $customVariableDatatables = $customVariables->getDataTables(); + $dataTables = $dataTable->getDataTables(); foreach ($customVariableDatatables as $key => $customVariableTableForDate) { $dataTableForDate = isset($dataTables[$key]) ? $dataTables[$key] : new DataTable(); @@ -296,7 +296,7 @@ class API protected function renameNotDefinedRow($dataTable, $notDefinedStringPretty) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { $this->renameNotDefinedRow($table, $notDefinedStringPretty); } return; @@ -414,7 +414,7 @@ class API } if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $row) { + foreach ($dataTable->getDataTables() as $row) { $this->enrichTable($row); } } else { diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index db904865cd..ec90bd9305 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -420,7 +420,7 @@ class API } else // if the report has no dimension we have multiple reports each with only one row within the reportData { // $periodsData instanceof Simple[] - $periodsData = array_values($reportData->getArray()); + $periodsData = array_values($reportData->getDataTables()); $periodsCount = count($periodsData); for ($i = 0; $i < $periodsCount; $i++) { diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 790d9894b4..ca4f559056 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -95,7 +95,7 @@ class API * This function will merge the result of the archive query so each * row in the result DataTable will correspond to the metrics of a single * site. If a date range is specified, the result will be a - * DataTable_Array, but it will still be merged. + * DataTable\Map, but it will still be merged. * * @param string $period The period type to get data for. * @param string $date The date(s) to get data for. @@ -226,7 +226,7 @@ class API // $dataTable instanceOf Set $dataTable = $archive->getDataTableFromNumeric($fieldsToGet); - // get rid of the DataTable_Array that is created by the IndexedBySite archive type + // get rid of the DataTable\Map that is created by the IndexedBySite archive type if ($dataTable instanceof DataTable\Map && $multipleWebsitesRequested ) { @@ -251,7 +251,7 @@ class API if ($strLastDate !== false) { if ($lastPeriod !== false) { // NOTE: no easy way to set last period date metadata when range of dates is requested. - // will be easier if DataTable_Array::metadata is removed, and metadata that is + // will be easier if DataTable\Map::metadata is removed, and metadata that is // put there is put directly in DataTable::metadata. $dataTable->setMetadata(self::getLastPeriodMetadataName('date'), $lastPeriod); } @@ -340,8 +340,8 @@ class API } if ($currentData instanceof DataTable\Map) { - $pastArray = $pastData->getArray(); - foreach ($currentData->getArray() as $subTable) { + $pastArray = $pastData->getDataTables(); + foreach ($currentData->getDataTables() as $subTable) { $this->calculateEvolutionPercentages($subTable, current($pastArray), $apiMetrics); next($pastArray); } @@ -370,7 +370,7 @@ class API private function setMetricsTotalsMetadata($dataTable, $apiMetrics) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { $this->setMetricsTotalsMetadata($table, $apiMetrics); } } else { @@ -409,8 +409,8 @@ class API private function setPastDataMetadata($dataTable, $pastData, $apiMetrics) { if ($dataTable instanceof DataTable\Map) { - $pastArray = $pastData->getArray(); - foreach ($dataTable->getArray() as $subTable) { + $pastArray = $pastData->getDataTables(); + foreach ($dataTable->getDataTables() as $subTable) { $this->setPastDataMetadata($subTable, current($pastArray), $apiMetrics); next($pastArray); } diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php index dbcae011fd..40542ef26f 100644 --- a/plugins/Referers/API.php +++ b/plugins/Referers/API.php @@ -170,7 +170,7 @@ class API } // set subtable IDs for each row to the label (which holds the int referrer type) - // NOTE: not yet possible to do this w/ DataTable_Array instances + // NOTE: not yet possible to do this w/ DataTable\Map instances if (!($dataTable instanceof DataTable\Map)) { $this->setGetReferrerTypeSubtables($dataTable, $idSite, $period, $date, $segment, $expanded); } @@ -275,7 +275,7 @@ class API // If period=lastX we only keep the first resultset as we want to return a plain list if ($table instanceof DataTable\Map) { - $tables = $table->getArray(); + $tables = $table->getDataTables(); $table = current($tables); } // Keep the response simple, only include keywords @@ -316,7 +316,7 @@ class API $searchEngines->applyQueuedFilters(); if ($searchEngines instanceof DataTable\Map) { - $dataTables = $searchEngines->getArray(); + $dataTables = $searchEngines->getDataTables(); // find first datatable containing data foreach ($dataTables AS $subTable) { @@ -480,7 +480,7 @@ class API private function removeSubtableMetadata($dataTable) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $childTable) { + foreach ($dataTable->getDataTables() as $childTable) { $this->removeSubtableMetadata($childTable); } } else { @@ -500,7 +500,7 @@ class API private function setSocialIdSubtables($dataTable) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $childTable) { + foreach ($dataTable->getDataTables() as $childTable) { $this->setSocialIdSubtables($childTable); } } else { @@ -532,7 +532,7 @@ class API private function removeSubtableIds($table) { if ($table instanceof DataTable\Map) { - foreach ($table->getArray() as $childTable) { + foreach ($table->getDataTables() as $childTable) { $this->removeSubtableIds($childTable); } } else { @@ -592,7 +592,7 @@ class API */ private function replaceEmptyDataTablesWith(Map $replaceIn, Map $replaceWith) { - foreach ($replaceWith->getArray() as $label => $replaceWithChildTable) { + foreach ($replaceWith->getDataTables() as $label => $replaceWithChildTable) { if ($replaceWithChildTable instanceof Map) { // recurse $this->replaceEmptyDataTablesWith($replaceIn->getTable($label), $replaceWithChildTable); } else { diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index 34b79f3f3d..bf42b0c949 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Referers; use Piwik\API\Request; +use Piwik\DataTable\Map; use Piwik\Metrics; use Piwik\Period\Range; use Piwik\Piwik; @@ -357,7 +358,8 @@ class Controller extends \Piwik\Controller . '&format=original'; $request = new Request($topPageUrlRequest); $request = $request->process(); - $tables = $request->getArray(); + /** @var $request Map */ + $tables = $request->getDataTables();; $topPageUrl = false; $first = key($tables); diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 701d848904..4e9ef40d04 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -185,9 +185,9 @@ class API // check whether given tables are arrays if ($dataTable instanceof DataTable\Map) { - $tableArray = $dataTable->getArray(); - $browserTypesArray = $browserTypes->getArray(); - $visitSumsArray = $visitsSums->getArray(); + $tableArray = $dataTable->getDataTables(); + $browserTypesArray = $browserTypes->getDataTables(); + $visitSumsArray = $visitsSums->getDataTables(); } else { $tableArray = array($dataTable); $browserTypesArray = array($browserTypes); diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php index 7a6f925254..d1cf937d0f 100644 --- a/plugins/VisitorInterest/API.php +++ b/plugins/VisitorInterest/API.php @@ -116,7 +116,7 @@ class API private static function addVisitsPercentColumn($dataTable) { if ($dataTable instanceof DataTable\Map) { - foreach ($dataTable->getArray() as $table) { + foreach ($dataTable->getDataTables() as $table) { self::addVisitsPercentColumn($table); } } else { diff --git a/tests/PHPUnit/Core/DataTable/MapTest.php b/tests/PHPUnit/Core/DataTable/MapTest.php index 788c7597ad..9840499ec3 100644 --- a/tests/PHPUnit/Core/DataTable/MapTest.php +++ b/tests/PHPUnit/Core/DataTable/MapTest.php @@ -38,24 +38,24 @@ class Test_DataTable_Map extends PHPUnit_Framework_TestCase return $dataTable; } - private function createInstanceWithDataTableArrays() + private function createInstanceWithDataTableMaps() { $dataTable = new DataTable\Map(); - $subDataTableArray1 = $this->createInstanceWithDataTables(); - $dataTable->addTable($subDataTableArray1, 'subArray1'); + $subDataTableMap1 = $this->createInstanceWithDataTables(); + $dataTable->addTable($subDataTableMap1, 'subArray1'); - $subDataTableArray2 = $this->createInstanceWithDataTables(); - $dataTable->addTable($subDataTableArray2, 'subArray2'); + $subDataTableMap2 = $this->createInstanceWithDataTables(); + $dataTable->addTable($subDataTableMap2, 'subArray2'); return $dataTable; } /** - * Tests that Set::mergeChildren works when the DataTable_Array contains DataTables. + * Tests that Set::mergeChildren works when the DataTable\Map contains DataTables. * @group Core * @group DataTable - * @group DataTable_Array + * @group DataTable\Map */ public function test_MergeChildrenDataTable() { @@ -83,18 +83,18 @@ class Test_DataTable_Map extends PHPUnit_Framework_TestCase } /** - * Tests that Set::mergeChildren works when the DataTable_Array contains DataTable_Arrays. + * Tests that Set::mergeChildren works when the DataTable\Map contains DataTable\Maps. * @group Core * @group DataTable - * @group DataTable_Array + * @group DataTable\Map */ - public function testMergeChildrenDataTableArray() + public function testMergeChildrenDataTableMap() { - $dataTable = $this->createInstanceWithDataTableArrays(); + $dataTable = $this->createInstanceWithDataTableMaps(); $result = $dataTable->mergeChildren(); - // check that the result is a DataTable_Array w/ two DataTable children + // check that the result is a DataTable\Map w/ two DataTable children $this->assertInstanceOf('\Piwik\DataTable\Map', $result); $this->assertEquals(2, $result->getRowsCount()); diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php index 52320105f6..435e34b747 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php @@ -202,7 +202,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * ------------------------- */ - protected function _getDataTableArrayTest() + protected function _getDataTableMapTest() { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), @@ -239,7 +239,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleArrayTest() + protected function _getDataTableSimpleMapTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); $table1 = new Simple; @@ -260,7 +260,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleOneRowArrayTest() + protected function _getDataTableSimpleOneRowMapTest() { $array1 = array('nb_visits' => 14.0); $table1 = new Simple; @@ -280,27 +280,27 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableArray_containsDataTableArray_normal() + protected function _getDataTableMap_containsDataTableMap_normal() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simple() + protected function _getDataTableMap_containsDataTableMap_simple() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simpleOneRow() + protected function _getDataTableMap_containsDataTableMap_simpleOneRow() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleOneRowMapTest(), 'idSite'); return $table; } @@ -310,9 +310,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayTest1() + public function testCSVMapTest1() { - $dataTable = $this->_getDataTableArrayTest(); + $dataTable = $this->_getDataTableMapTest(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; @@ -332,9 +332,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayTest2() + public function testCSVMapTest2() { - $dataTable = $this->_getDataTableSimpleArrayTest(); + $dataTable = $this->_getDataTableSimpleMapTest(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; @@ -350,9 +350,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayTest3() + public function testCSVMapTest3() { - $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); + $dataTable = $this->_getDataTableSimpleOneRowMapTest(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; @@ -367,9 +367,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayisMadeOfArrayTest1() + public function testCSVMapisMadeOfMapTest1() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_normal(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; @@ -389,9 +389,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayIsMadeOfArrayTest2() + public function testCSVMapIsMadeOfMapTest2() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simple(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; @@ -407,9 +407,9 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_CSV */ - public function testCSVArrayIsMadeOfArrayTest3() + public function testCSVMapIsMadeOfMapTest3() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php index fa7597efeb..a6dfe3b933 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php @@ -190,7 +190,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * ------------------------- */ - protected function _getDataTableArrayTest() + protected function _getDataTableMapTest() { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), @@ -227,7 +227,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleArrayTest() + protected function _getDataTableSimpleMapTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); $table1 = new Simple; @@ -248,7 +248,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleOneRowArrayTest() + protected function _getDataTableSimpleOneRowMapTest() { $array1 = array('nb_visits' => 14.0); $table1 = new Simple; @@ -268,27 +268,27 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableArray_containsDataTableArray_normal() + protected function _getDataTableMap_containsDataTableMap_normal() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simple() + protected function _getDataTableMap_containsDataTableMap_simple() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simpleOneRow() + protected function _getDataTableMap_containsDataTableMap_simpleOneRow() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleOneRowMapTest(), 'idSite'); return $table; } @@ -301,7 +301,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase */ public function testJSONArrayTest1() { - $dataTable = $this->_getDataTableArrayTest(); + $dataTable = $this->_getDataTableMapTest(); $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -316,9 +316,9 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_JSON */ - public function testJSONArrayTest2() + public function testJSONMapTest2() { - $dataTable = $this->_getDataTableSimpleArrayTest(); + $dataTable = $this->_getDataTableSimpleMapTest(); $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -334,9 +334,9 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_JSON */ - public function testJSONArrayTest3() + public function testJSONMapTest3() { - $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); + $dataTable = $this->_getDataTableSimpleOneRowMapTest(); $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -351,9 +351,9 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_JSON */ - public function testJSONArrayIsMadeOfArrayTest1() + public function testJSONMapIsMadeOfMapTest1() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_normal(); $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -367,9 +367,9 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_JSON */ - public function testJSONArrayIsMadeOfArrayTest2() + public function testJSONMapIsMadeOfMapTest2() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simple(); $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -385,9 +385,9 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_JSON */ - public function testJSONArrayIsMadeOfArrayTest3() + public function testJSONMapIsMadeOfMapTest3() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow(); $render = new Json(); $render->setTable($dataTable); diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php index 89db87e012..c75c5c23af 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php @@ -246,7 +246,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * ------------------------- */ - protected function _getDataTableArrayTest() + protected function _getDataTableMapTest() { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), @@ -283,7 +283,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleArrayTest() + protected function _getDataTableSimpleMapTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); $table1 = new Simple; @@ -304,7 +304,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleOneRowArrayTest() + protected function _getDataTableSimpleOneRowMapTest() { $array1 = array('nb_visits' => 14.0); $table1 = new Simple; @@ -324,27 +324,27 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableArray_containsDataTableArray_normal() + protected function _getDataTableMap_containsDataTableMap_normal() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simple() + protected function _getDataTableMap_containsDataTableMap_simple() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simpleOneRow() + protected function _getDataTableMap_containsDataTableMap_simpleOneRow() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleOneRowMapTest(), 'idSite'); return $table; } @@ -355,9 +355,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayTest1() + public function testPHPMapTest1() { - $dataTable = $this->_getDataTableArrayTest(); + $dataTable = $this->_getDataTableMapTest(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -412,9 +412,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayTest2() + public function testPHPMapTest2() { - $dataTable = $this->_getDataTableSimpleArrayTest(); + $dataTable = $this->_getDataTableSimpleMapTest(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -442,9 +442,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayTest3() + public function testPHPMapTest3() { - $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); + $dataTable = $this->_getDataTableSimpleOneRowMapTest(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -463,9 +463,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayIsMadeOfArrayTest1() + public function testPHPMapIsMadeOfMapTest1() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_normal(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -522,9 +522,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayIsMadeOfArrayTest2() + public function testPHPMapIsMadeOfMapTest2() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simple(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -553,9 +553,9 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_PHP */ - public function testPHPArrayIsMadeOfArrayTest3() + public function testPHPMapIsMadeOfMapTest3() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow(); $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php index 205da80d09..425875775e 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php @@ -246,7 +246,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * ------------------------- */ - protected function _getDataTableArrayTest() + protected function _getDataTableMapTest() { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), @@ -283,7 +283,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleArrayTest() + protected function _getDataTableSimpleMapTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); $table1 = new Simple; @@ -304,7 +304,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableSimpleOneRowArrayTest() + protected function _getDataTableSimpleOneRowMapTest() { $array1 = array('nb_visits' => 14.0); $table1 = new Simple; @@ -324,27 +324,27 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase return $table; } - protected function _getDataTableArray_containsDataTableArray_normal() + protected function _getDataTableMap_containsDataTableMap_normal() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simple() + protected function _getDataTableMap_containsDataTableMap_simple() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleMapTest(), 'idSite'); return $table; } - protected function _getDataTableArray_containsDataTableArray_simpleOneRow() + protected function _getDataTableMap_containsDataTableMap_simpleOneRow() { $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); - $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); + $table->addTable($this->_getDataTableSimpleOneRowMapTest(), 'idSite'); return $table; } @@ -354,9 +354,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayTest1() + public function testXMLMapTest1() { - $dataTable = $this->_getDataTableArrayTest(); + $dataTable = $this->_getDataTableMapTest(); $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> @@ -404,9 +404,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayIsMadeOfArrayTest1() + public function testXMLArrayIsMadeOfMapTest1() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_normal(); $render = new Xml(); $render->setTable($dataTable); @@ -458,9 +458,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayTest2() + public function testXMLMapTest2() { - $dataTable = $this->_getDataTableSimpleArrayTest(); + $dataTable = $this->_getDataTableSimpleMapTest(); $render = new Xml(); $render->setTable($dataTable); @@ -485,9 +485,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayIsMadeOfArrayTest2() + public function testXMLArrayIsMadeOfMapTest2() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simple(); $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> @@ -514,9 +514,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayTest3() + public function testXMLMapTest3() { - $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); + $dataTable = $this->_getDataTableSimpleOneRowMapTest(); $render = new Xml(); $render->setTable($dataTable); @@ -536,9 +536,9 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase * @group DataTable_Renderer * @group DataTable_Renderer_XML */ - public function testXMLArrayIsMadeOfArrayTest3() + public function testXMLArrayIsMadeOfMapTest3() { - $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); + $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow(); $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> |