From c02e6fcae218387a67d201d4171b312e2e82d310 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 3 Dec 2020 16:33:38 +0100
Subject: [PATCH] fix appconfig tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/AppConfig.php | 4 ++--
tests/lib/AppConfigTest.php | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 9e36ad0cd57..a671848245e 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -348,10 +348,10 @@ class AppConfig implements IAppConfig {
$rows = $result->fetchAll();
foreach ($rows as $row) {
if (!isset($this->cache[$row['appid']])) {
- $this->cache[$row['appid']] = [];
+ $this->cache[(string)$row['appid']] = [];
}
- $this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+ $this->cache[(string)$row['appid']][(string)$row['configkey']] = (string)$row['configvalue'];
}
$result->closeCursor();
diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php
index 40a99709bd5..d2643d599f3 100644
--- a/tests/lib/AppConfigTest.php
+++ b/tests/lib/AppConfigTest.php
@@ -140,11 +140,11 @@ class AppConfigTest extends TestCase {
public function testGetApps() {
$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
- $this->assertEquals([
+ $this->assertEqualsCanonicalizing([
'anotherapp',
'someapp',
'testapp',
- '123456',
+ 123456,
], $config->getApps());
}
@@ -152,7 +152,7 @@ class AppConfigTest extends TestCase {
$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
$keys = $config->getKeys('testapp');
- $this->assertEquals([
+ $this->assertEqualsCanonicalizing([
'deletethis',
'depends_on',
'enabled',
--
GitLab