Skip to content

Commit 50ec863

Browse files
authored
Merge pull request #19347 from nextcloud/fix/19345/log_deprecated_alias_use
Log untyped server DI requests
2 parents 458ec33 + c1152af commit 50ec863

File tree

4 files changed

+89
-71
lines changed

4 files changed

+89
-71
lines changed

apps/files_trashbin/tests/TrashbinTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected function setUp(): void {
129129
return $config->getSystemValue($key, $default);
130130
}
131131
}));
132-
$this->overwriteService('AllConfig', $mockConfig);
132+
$this->overwriteService(\OC\AllConfig::class, $mockConfig);
133133

134134
$this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';
135135
$this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin';
@@ -138,7 +138,7 @@ protected function setUp(): void {
138138
}
139139

140140
protected function tearDown(): void {
141-
$this->restoreService('AllConfig');
141+
$this->restoreService(\OC\AllConfig::class);
142142
// disable trashbin to be able to properly clean up
143143
\OC::$server->getAppManager()->disableApp('files_trashbin');
144144

apps/files_versions/tests/VersioningTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected function setUp(): void {
9393
return $config->getSystemValue($key, $default);
9494
}
9595
}));
96-
$this->overwriteService('AllConfig', $mockConfig);
96+
$this->overwriteService(\OC\AllConfig::class, $mockConfig);
9797

9898
// clear hooks
9999
\OC_Hook::clear();
@@ -115,7 +115,7 @@ protected function setUp(): void {
115115
}
116116

117117
protected function tearDown(): void {
118-
$this->restoreService('AllConfig');
118+
$this->restoreService(\OC\AllConfig::class);
119119

120120
if ($this->rootView) {
121121
$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
@@ -629,7 +629,7 @@ public function testExpireNonexistingFile() {
629629
$this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
630630
}
631631

632-
632+
633633
public function testExpireNonexistingUser() {
634634
$this->expectException(\OC\User\NoUserException::class);
635635

0 commit comments

Comments
 (0)