diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-01-24 13:14:19 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-01-24 18:12:18 +0000 |
| commit | 99e76d7a99b68d122340b76d726b2f40f354d6f9 (patch) | |
| tree | 421d1e920f000d8f707749da6c9d7e7b3b238499 /tests | |
| parent | ae3e26024e505cfae3196471525a701a2e87e7dd (diff) | |
| download | nextcloud-server-99e76d7a99b68d122340b76d726b2f40f354d6f9.tar.gz nextcloud-server-99e76d7a99b68d122340b76d726b2f40f354d6f9.zip | |
fix(TemplateLayout): `core` is not an app but the server itself
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/AppTest.php | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 98c3a6ff158..3e4d762a0a4 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -12,7 +12,13 @@ use OC\App\InfoParser; use OC\AppConfig; use OCP\EventDispatcher\IEventDispatcher; use OCP\IAppConfig; -use OCP\IURLGenerator; +use OCP\ICacheFactory; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IGroupManager; +use OCP\IUserManager; +use OCP\IUserSession; +use OCP\ServerVersion; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; @@ -463,8 +469,8 @@ class AppTest extends \Test\TestCase { * @dataProvider appConfigValuesProvider */ public function testEnabledApps($user, $expectedApps, $forceAll): void { - $userManager = \OC::$server->getUserManager(); - $groupManager = \OC::$server->getGroupManager(); + $userManager = \OCP\Server::get(IUserManager::class); + $groupManager = \OCP\Server::get(IGroupManager::class); $user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+'); $user2 = $userManager->createUser(self::TEST_USER2, 'NotAnEasyPassword123456_'); $user3 = $userManager->createUser(self::TEST_USER3, 'NotAnEasyPassword123456?'); @@ -512,7 +518,7 @@ class AppTest extends \Test\TestCase { * enabled apps more than once when a user is set. */ public function testEnabledAppsCache(): void { - $userManager = \OC::$server->getUserManager(); + $userManager = \OCP\Server::get(IUserManager::class); $user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+'); \OC_User::setUserId(self::TEST_USER1); @@ -544,8 +550,8 @@ class AppTest extends \Test\TestCase { private function setupAppConfigMock() { /** @var AppConfig|MockObject */ $appConfig = $this->getMockBuilder(AppConfig::class) - ->setMethods(['getValues']) - ->setConstructorArgs([\OC::$server->getDatabaseConnection()]) + ->onlyMethods(['getValues']) + ->setConstructorArgs([\OCP\Server::get(IDBConnection::class)]) ->disableOriginalConstructor() ->getMock(); @@ -561,13 +567,13 @@ class AppTest extends \Test\TestCase { private function registerAppConfig(AppConfig $appConfig) { $this->overwriteService(AppConfig::class, $appConfig); $this->overwriteService(AppManager::class, new AppManager( - \OC::$server->getUserSession(), - \OC::$server->getConfig(), - \OC::$server->getGroupManager(), - \OC::$server->getMemCacheFactory(), - \OC::$server->get(IEventDispatcher::class), - \OC::$server->get(LoggerInterface::class), - \OC::$server->get(IURLGenerator::class), + \OCP\Server::get(IUserSession::class), + \OCP\Server::get(IConfig::class), + \OCP\Server::get(IGroupManager::class), + \OCP\Server::get(ICacheFactory::class), + \OCP\Server::get(IEventDispatcher::class), + \OCP\Server::get(LoggerInterface::class), + \OCP\Server::get(ServerVersion::class), )); } |