From 0508e38d7d2247501ee2951e90e01724b79776b6 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Tue, 5 Aug 2014 23:08:47 +0200
Subject: [PATCH] refs #5896 this fixes some tests
---
core/DataTable.php | 3 +++
core/DataTable/Filter/ColumnDelete.php | 4 ++--
plugins/API/tests/RssRendererTest.php | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/core/DataTable.php b/core/DataTable.php
index 1e594e4e41..7bf7cceef5 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -1634,6 +1634,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate
$thisRow->sumRow($row, $copyMeta = true, $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME));
}
+ /**
+ * @return \ArrayIterator|Row[]
+ */
public function getIterator() {
return new \ArrayIterator($this->rows);
}
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index f9f9773af8..532cd5c644 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -100,7 +100,7 @@ class ColumnDelete extends BaseFilter
// remove columns specified in $this->columnsToRemove
if (!empty($this->columnsToRemove)) {
- foreach ($table as $row) {
+ foreach ($table as &$row) {
foreach ($this->columnsToRemove as $column) {
if ($this->deleteIfZeroOnly) {
$value = $row[$column];
@@ -118,7 +118,7 @@ class ColumnDelete extends BaseFilter
// remove columns not specified in $columnsToKeep
if (!empty($this->columnsToKeep)) {
- foreach ($table as $row) {
+ foreach ($table as &$row) {
foreach ($row as $name => $value) {
$keep = false;
diff --git a/plugins/API/tests/RssRendererTest.php b/plugins/API/tests/RssRendererTest.php
index 1145ce3da9..175699fca3 100644
--- a/plugins/API/tests/RssRendererTest.php
+++ b/plugins/API/tests/RssRendererTest.php
@@ -155,7 +155,7 @@ class RssRendererTest extends \DatabaseTestCase
<title>piwik statistics - RSS</title>
<link>http://piwik.org</link>
<description>Piwik RSS feed</description>
-
+
<generator>piwik</generator>
<language>en</language>
</channel>
--
GitLab