mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix appconfig tests 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-12-03 16:33:38 +01:00
parent b3037dee6a
commit c02e6fcae2
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/AppConfig.php
View File

@ -348,10 +348,10 @@ class AppConfig implements IAppConfig {
$rows = $result->fetchAll(); $rows = $result->fetchAll();
foreach ($rows as $row) { foreach ($rows as $row) {
if (!isset($this->cache[$row['appid']])) { 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(); $result->closeCursor();

6
tests/lib/AppConfigTest.php
View File

@ -140,11 +140,11 @@ class AppConfigTest extends TestCase {
public function testGetApps() { public function testGetApps() {
$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
$this->assertEquals([ $this->assertEqualsCanonicalizing([
'anotherapp', 'anotherapp',
'someapp', 'someapp',
'testapp', 'testapp',
'123456', 123456,
], $config->getApps()); ], $config->getApps());
} }
@ -152,7 +152,7 @@ class AppConfigTest extends TestCase {
$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
$keys = $config->getKeys('testapp'); $keys = $config->getKeys('testapp');
$this->assertEquals([ $this->assertEqualsCanonicalizing([
'deletethis', 'deletethis',
'depends_on', 'depends_on',
'enabled', 'enabled',