Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/DataTable.php2
-rw-r--r--tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php2
-rw-r--r--tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/DataTable.php b/core/DataTable.php
index 2cf90b03ec..4a1bc6eebf 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -1522,7 +1522,7 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
}
if ($thisIsNotThatSimple === false) {
// case when the array is indexed by the default numeric index
- if (array_keys($array) == array_keys(array_fill(0, count($array), true))) {
+ if (array_keys($array) === array_keys(array_fill(0, count($array), true))) {
foreach ($array as $row) {
$this->addRow(new Row(array(Row::COLUMNS => array($row))));
}
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
index 08eab453d3..fe7aa7b489 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
@@ -459,7 +459,7 @@ b,d,f,g';
$render = new Csv();
$render->setTable($data);
$render->convertToUnicode = false;
- $expected = 'b';
+ $expected = "a\nb";
$this->assertEquals($expected, $render->render());
}
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
index 3bdae1d33c..d289959242 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
@@ -140,7 +140,7 @@ class ConsoleTest extends \PHPUnit\Framework\TestCase
$render = new Console();
$render->setTable($data);
- $expected = "- 1 ['0' => 'b'] [] [idsubtable = ]<br />
+ $expected = "- 1 ['a' => 'b'] [] [idsubtable = ]<br />
";
$this->assertEquals($expected, $render->render());