diff --git a/.github/workflows/repair.yml b/.github/workflows/repair.yml index 2efbabf45..74ca32311 100644 --- a/.github/workflows/repair.yml +++ b/.github/workflows/repair.yml @@ -77,9 +77,8 @@ jobs: - name: Checkout submodules shell: bash run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + git submodule update --init --force --recursive --depth=1 - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 @@ -139,4 +138,4 @@ jobs: - name: Check logs if: always() run: | - cat data/nextcloud.log \ No newline at end of file + cat data/nextcloud.log diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml index cfe27863c..fa533dccb 100644 --- a/.github/workflows/upgrade.yml +++ b/.github/workflows/upgrade.yml @@ -68,9 +68,8 @@ jobs: - name: Checkout submodules shell: bash run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + git submodule update --init --force --recursive --depth=1 - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 diff --git a/appinfo/info.xml b/appinfo/info.xml index 412ceb2fd..fee855e4f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ Requirements: - mbstring: * - when using MySQL, use at least v8.0 ]]> - 16.1.4 + 16.2.0-dev.0 agpl Marcel Klehr Arthur Schiwon @@ -42,7 +42,7 @@ Requirements: pgsql intl mbstring - + OCA\Bookmarks\BackgroundJobs\CrawlJob diff --git a/lib/AugmentedTemplateResponse.php b/lib/AugmentedTemplateResponse.php index 6ad9b0417..cd6977f1e 100644 --- a/lib/AugmentedTemplateResponse.php +++ b/lib/AugmentedTemplateResponse.php @@ -8,8 +8,8 @@ namespace OCA\Bookmarks; -use OC; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IURLGenerator; /** * @template S of \OCP\AppFramework\Http::STATUS_* @@ -19,7 +19,7 @@ class AugmentedTemplateResponse extends TemplateResponse { public function render() { $return = parent::render(); - preg_replace('//i', '', $return); + preg_replace('//i', '', $return); return $return; } } diff --git a/lib/Db/BookmarkMapper.php b/lib/Db/BookmarkMapper.php index cb8f2aaf7..b786248d5 100644 --- a/lib/Db/BookmarkMapper.php +++ b/lib/Db/BookmarkMapper.php @@ -496,7 +496,7 @@ private function _filterDuplicated(IQueryBuilder $qb, QueryParameters $params) { private function _filterFolder(IQueryBuilder $qb, QueryParameters $params): void { if ($params->getFolder() !== null) { if ($params->getRecursive()) { - $childFolders = \OC::$server->get(TreeMapper::class)->findByAncestorFolder(TreeMapper::TYPE_FOLDER, $params->getFolder()); + $childFolders = \OCP\Server::get(TreeMapper::class)->findByAncestorFolder(TreeMapper::TYPE_FOLDER, $params->getFolder()); $ids = [...array_map(fn (Folder $folder) => $folder->getId(), $childFolders), $params->getFolder()]; $qb->andWhere($qb->expr()->in('tree.parent_folder', $qb->createPositionalParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); } else { diff --git a/lib/ExportResponse.php b/lib/ExportResponse.php index fb9e03e73..50b8d4090 100644 --- a/lib/ExportResponse.php +++ b/lib/ExportResponse.php @@ -8,11 +8,10 @@ namespace OCA\Bookmarks; -use OC; -use OC\HintException; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Http\Response; use OCP\IDateTimeFormatter; +use OCP\IUserSession; /** * @psalm-template S of int @@ -24,21 +23,20 @@ class ExportResponse extends Response { public function __construct($returnstring) { parent::__construct(); - - $user = OC::$server->getUserSession()->getUser(); - if (is_null($user)) { - throw new HintException('User not logged in'); - } - - $userName = $user->getDisplayName(); - $themingDefaults = \OCP\Server::get(ThemingDefaults::class); $dateTime = \OCP\Server::get(IDateTimeFormatter::class); + $themingDefaults = \OCP\Server::get(ThemingDefaults::class); $productName = $themingDefaults->getName(); + $userName = null; + + $user = \OCP\Server::get(IUserSession::class)->getUser(); + if ($user !== null) { + $userName = $user->getDisplayName(); + } - $export_name = '"' . $productName . ' Bookmarks (' . $userName . ') (' . $dateTime->formatDate(time()) . ').html"'; + $export_name = '"' . $productName . ' Bookmarks' . ($userName ? ' (' . $userName . ') ' : '') . '(' . $dateTime->formatDate(time()) . ').html"'; $this->addHeader('Cache-Control', 'private'); - $this->addHeader('Content-Type', ' application/stream'); - $this->addHeader('Content-Length', strlen($returnstring)); + $this->addHeader('Content-Type', 'application/stream'); + $this->addHeader('Content-Length', '' . strlen($returnstring)); $this->addHeader('Content-Disposition', 'attachment; filename=' . $export_name); $this->returnstring = $returnstring; } diff --git a/lib/Flow/CreateBookmark.php b/lib/Flow/CreateBookmark.php index 022b22336..b2563ca7c 100644 --- a/lib/Flow/CreateBookmark.php +++ b/lib/Flow/CreateBookmark.php @@ -8,7 +8,6 @@ namespace OCA\Bookmarks\Flow; -use OC; use OCA\Bookmarks\Exception\AlreadyExistsError; use OCA\Bookmarks\Exception\UnsupportedOperation; use OCA\Bookmarks\Exception\UrlParseError; @@ -73,12 +72,12 @@ public function __construct(IL10N $l, BookmarkService $bookmarks, IUserSession $ public static function register(IEventDispatcher $dispatcher): void { if (interface_exists(IManager::class)) { $dispatcher->addListener(RegisterOperationsEvent::class, static function (RegisterOperationsEvent $event) { - $operation = OC::$server->query(CreateBookmark::class); + $operation = \OCP\Server::get(CreateBookmark::class); $event->registerOperation($operation); Util::addScript('bookmarks', 'bookmarks-flow'); }); $dispatcher->addListener(RegisterEntitiesEvent::class, static function (RegisterEntitiesEvent $event) { - $entity = OC::$server->query(Bookmark::class); + $entity = \OCP\Server::get(Bookmark::class); $event->registerEntity($entity); Util::addScript('bookmarks', 'bookmarks-flow'); }); diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 81e877e26..0e487c5b9 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -22,6 +22,11 @@ folderController->getFolders()->getData()]]> + + + + + bookmarkMapper->findAll($userId, $params)]]> @@ -48,6 +53,9 @@ + + + diff --git a/tests/BackupManagerTest.php b/tests/BackupManagerTest.php index 27032cfd8..6f5117b47 100644 --- a/tests/BackupManagerTest.php +++ b/tests/BackupManagerTest.php @@ -10,6 +10,7 @@ use OCA\Bookmarks\Service\BookmarkService; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\AppFramework\Utility\ITimeFactory; +use OCP\IUserManager; class BackupManagerTest extends TestCase { /** @@ -47,12 +48,12 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->bookmarks = \OC::$server->query(BookmarkService::class); - $this->backupManager = \OC::$server->query(BackupManager::class); + $this->bookmarks = \OCP\Server::get(BookmarkService::class); + $this->backupManager = \OCP\Server::get(BackupManager::class); $this->time = $this->createStub(ITimeFactory::class); $this->backupManager->injectTimeFactory($this->time); - $this->userManager = \OC::$server->getUserManager(); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/BookmarkControllerTest.php b/tests/BookmarkControllerTest.php index 3db2f8727..dcebd854c 100644 --- a/tests/BookmarkControllerTest.php +++ b/tests/BookmarkControllerTest.php @@ -2,7 +2,6 @@ namespace OCA\Bookmarks\Tests; -use OC; use OCA\Bookmarks\Controller\BookmarkController; use OCA\Bookmarks\Db\Bookmark; use OCA\Bookmarks\Db\BookmarkMapper; @@ -161,12 +160,12 @@ protected function setUp(): void { $this->user = 'test'; $this->otherUser = 'otheruser'; - $this->request = OC::$server->get(IRequest::class); - $this->otherRequest = OC::$server->get(IRequest::class); + $this->request = \OCP\Server::get(IRequest::class); + $this->otherRequest = \OCP\Server::get(IRequest::class); $this->publicRequest = $this->createMock(IRequest::class); - $this->userManager = OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); } @@ -177,27 +176,27 @@ protected function setUp(): void { $this->otherUserId = $this->userManager->get($this->otherUser)->getUID(); /** @var IFactory $l10nFactory */ - $l10nFactory = OC::$server->get(IFactory::class); + $l10nFactory = \OCP\Server::get(IFactory::class); $l = $l10nFactory->get('bookmarks'); - $this->bookmarks = OC::$server->get(BookmarkService::class); - $this->bookmarkMapper = OC::$server->get(BookmarkMapper::class); - $this->tagMapper = OC::$server->get(TagMapper::class); - $this->folderMapper = OC::$server->get(FolderMapper::class); - $this->treeMapper = OC::$server->get(TreeMapper::class); - $this->publicFolderMapper = OC::$server->get(PublicFolderMapper::class); - $this->shareMapper = OC::$server->get(ShareMapper::class); - $this->sharedFolderMapper = OC::$server->get(SharedFolderMapper::class); - - $timeFactory = OC::$server->get(ITimeFactory::class); - $logger = OC::$server->get(LoggerInterface::class); - $urlGenerator = OC::$server->get(IURLGenerator::class); - $htmlExporter = OC::$server->get(HtmlExporter::class); - $this->authorizer = OC::$server->get(Authorizer::class); - $this->folders = OC::$server->get(FolderService::class); - $this->lockManager = OC::$server->get(LockManager::class); + $this->bookmarks = \OCP\Server::get(BookmarkService::class); + $this->bookmarkMapper = \OCP\Server::get(BookmarkMapper::class); + $this->tagMapper = \OCP\Server::get(TagMapper::class); + $this->folderMapper = \OCP\Server::get(FolderMapper::class); + $this->treeMapper = \OCP\Server::get(TreeMapper::class); + $this->publicFolderMapper = \OCP\Server::get(PublicFolderMapper::class); + $this->shareMapper = \OCP\Server::get(ShareMapper::class); + $this->sharedFolderMapper = \OCP\Server::get(SharedFolderMapper::class); + + $timeFactory = \OCP\Server::get(ITimeFactory::class); + $logger = \OCP\Server::get(LoggerInterface::class); + $urlGenerator = \OCP\Server::get(IURLGenerator::class); + $htmlExporter = \OCP\Server::get(HtmlExporter::class); + $this->authorizer = \OCP\Server::get(Authorizer::class); + $this->folders = \OCP\Server::get(FolderService::class); + $this->lockManager = \OCP\Server::get(LockManager::class); /** @var IRootFolder $rootFolder */ - $rootFolder = OC::$server->get(IRootFolder::class); + $rootFolder = \OCP\Server::get(IRootFolder::class); $this->controller = new BookmarkController('bookmarks', $this->request, $l, $this->bookmarkMapper, $this->tagMapper, $this->folderMapper, $this->treeMapper, $this->publicFolderMapper, $timeFactory, $logger, $htmlExporter, $this->authorizer, $this->bookmarks, $this->folders, $rootFolder, $this->lockManager); $this->otherController = new BookmarkController('bookmarks', $this->request, $l, $this->bookmarkMapper, $this->tagMapper, $this->folderMapper, $this->treeMapper, $this->publicFolderMapper, $timeFactory, $logger, $htmlExporter, $this->authorizer, $this->bookmarks, $this->folders, $rootFolder, $this->lockManager); diff --git a/tests/BookmarkMapperTest.php b/tests/BookmarkMapperTest.php index 8b02aef66..c00b3dbe8 100644 --- a/tests/BookmarkMapperTest.php +++ b/tests/BookmarkMapperTest.php @@ -2,7 +2,6 @@ namespace OCA\Bookmarks\Tests; -use OC; use OCA\Bookmarks\Db; use OCA\Bookmarks\Exception\AlreadyExistsError; use OCA\Bookmarks\Exception\UrlParseError; @@ -51,11 +50,11 @@ protected function setUp(): void { /** * @var Db\BookmarkMapper */ - $this->bookmarkMapper = OC::$server->get(Db\BookmarkMapper::class); - $this->treeMapper = OC::$server->get(Db\TreeMapper::class); - $this->folderMapper = OC::$server->get(Db\FolderMapper::class); + $this->bookmarkMapper = \OCP\Server::get(Db\BookmarkMapper::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); - $this->userManager = OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/FindTest.php b/tests/FindTest.php index 8c4ce69bf..2b906d864 100644 --- a/tests/FindTest.php +++ b/tests/FindTest.php @@ -9,6 +9,7 @@ use OCA\Bookmarks\QueryParameters; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\AppFramework\QueryException; +use OCP\IUserManager; class FindTest extends TestCase { /** @@ -55,12 +56,12 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->bookmarkMapper = \OC::$server->query(Db\BookmarkMapper::class); - $this->tagMapper = \OC::$server->query(Db\TagMapper::class); - $this->folderMapper = \OC::$server->query(Db\FolderMapper::class); - $this->treeMapper = \OC::$server->query(Db\TreeMapper::class); + $this->bookmarkMapper = \OCP\Server::get(Db\BookmarkMapper::class); + $this->tagMapper = \OCP\Server::get(Db\TagMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); - $this->userManager = \OC::$server->getUserManager(); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/FolderControllerTest.php b/tests/FolderControllerTest.php index edf5ea00f..519042431 100644 --- a/tests/FolderControllerTest.php +++ b/tests/FolderControllerTest.php @@ -2,7 +2,6 @@ namespace OCA\Bookmarks\Tests; -use OC; use OCA\Bookmarks\Controller\FoldersController; use OCA\Bookmarks\Db\Bookmark; use OCA\Bookmarks\Db\BookmarkMapper; @@ -92,11 +91,11 @@ protected function setUp(): void { $this->user = 'test'; $this->otherUser = 'otheruser'; - $this->request = OC::$server->get(IRequest::class); + $this->request = \OCP\Server::get(IRequest::class); $this->publicRequest = $this->createMock(IRequest::class); - $this->userManager = OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); } @@ -106,13 +105,13 @@ protected function setUp(): void { } $this->otherUserId = $this->userManager->get($this->otherUser)->getUID(); - $this->bookmarkMapper = OC::$server->get(BookmarkMapper::class); - $this->tagMapper = OC::$server->get(TagMapper::class); - $this->folderMapper = OC::$server->get(FolderMapper::class); - $this->treeMapper = OC::$server->get(TreeMapper::class); - $this->publicFolderMapper = OC::$server->get(PublicFolderMapper::class); - $this->shareMapper = OC::$server->get(ShareMapper::class); - $this->sharedFolderMapper = OC::$server->get(SharedFolderMapper::class); + $this->bookmarkMapper = \OCP\Server::get(BookmarkMapper::class); + $this->tagMapper = \OCP\Server::get(TagMapper::class); + $this->folderMapper = \OCP\Server::get(FolderMapper::class); + $this->treeMapper = \OCP\Server::get(TreeMapper::class); + $this->publicFolderMapper = \OCP\Server::get(PublicFolderMapper::class); + $this->shareMapper = \OCP\Server::get(ShareMapper::class); + $this->sharedFolderMapper = \OCP\Server::get(SharedFolderMapper::class); $this->emptyCache = $emptyCache = $this->createMock(ICache::class); $emptyCache->method('get')->willReturn(null); $emptyCache->method('set')->willReturn(true); @@ -127,13 +126,13 @@ protected function setUp(): void { $this->shareMapper, $this->sharedFolderMapper, $this->cacheFactory, - OC::$server->get(ContainerInterface::class), + \OCP\Server::get(ContainerInterface::class), $this->tagMapper, ); - $this->folders = OC::$server->get(FolderService::class); - $this->bookmarks = OC::$server->get(BookmarkService::class); - $this->groupManager = OC::$server->get(IGroupManager::class); - $loggerInterface = OC::$server->get(LoggerInterface::class); + $this->folders = \OCP\Server::get(FolderService::class); + $this->bookmarks = \OCP\Server::get(BookmarkService::class); + $this->groupManager = \OCP\Server::get(IGroupManager::class); + $loggerInterface = \OCP\Server::get(LoggerInterface::class); $this->group = $this->groupManager->createGroup('foobar'); $this->group->addUser($this->userManager->get($this->otherUser)); @@ -149,7 +148,7 @@ protected function setUp(): void { $this->treeMapper, $userSession, $this->sharedFolderMapper, - OC::$server->get(ICrypto::class), + \OCP\Server::get(ICrypto::class), $this->userManager, ); @@ -271,7 +270,7 @@ public function testHash(bool $useCache): void { $this->cacheFactory = $this->createMock(ICacheFactory::class); $this->cacheFactory->method('createDistributed') ->willReturnCallback(fn () - => OC::$server->get(ICacheFactory::class) + => \OCP\Server::get(ICacheFactory::class) ->createDistributed(time() . '' . random_int(0, 1000000)) ); } diff --git a/tests/FolderMapperTest.php b/tests/FolderMapperTest.php index 38428162c..be2442a5d 100644 --- a/tests/FolderMapperTest.php +++ b/tests/FolderMapperTest.php @@ -31,9 +31,9 @@ protected function setUp() : void { parent::setUp(); $this->cleanUp(); - $this->folderMapper = \OC::$server->get(Db\FolderMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); - $this->userManager = \OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/HtmlImportExportTest.php b/tests/HtmlImportExportTest.php index 4e3b7b493..e07713157 100644 --- a/tests/HtmlImportExportTest.php +++ b/tests/HtmlImportExportTest.php @@ -63,14 +63,14 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->bookmarkMapper = \OC::$server->get(Db\BookmarkMapper::class); - $this->tagMapper = \OC::$server->get(Db\TagMapper::class); - $this->folderMapper = \OC::$server->get(Db\FolderMapper::class); - $this->treeMapper = \OC::$server->get(Db\TreeMapper::class); - $this->htmlImporter = \OC::$server->get(Service\HtmlImporter::class); - $this->htmlExporter = \OC::$server->get(Service\HtmlExporter::class); - - $this->userManager = \OC::$server->get(IUserManager::class); + $this->bookmarkMapper = \OCP\Server::get(Db\BookmarkMapper::class); + $this->tagMapper = \OCP\Server::get(Db\TagMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); + $this->htmlImporter = \OCP\Server::get(Service\HtmlImporter::class); + $this->htmlExporter = \OCP\Server::get(Service\HtmlExporter::class); + + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/LockManagerTest.php b/tests/LockManagerTest.php index 22ddce3f4..47a055c7b 100644 --- a/tests/LockManagerTest.php +++ b/tests/LockManagerTest.php @@ -8,7 +8,6 @@ namespace OCA\Bookmarks\Tests; -use OC; use OCA\Bookmarks\Db\FolderMapper; use OCA\Bookmarks\Service\LockManager; use OCP\AppFramework\Utility\ITimeFactory; @@ -25,12 +24,12 @@ class LockManagerTest extends TestCase { protected function setUp(): void { parent::setUp(); $this->user = 'test'; - $this->folderMapper = OC::$server->get(FolderMapper::class); + $this->folderMapper = \OCP\Server::get(FolderMapper::class); $this->folderMapper->findRootFolder($this->user); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->timeStub = $this->timeFactory->expects($this->atLeastOnce())->method('getDateTime'); $this->timeStub->willReturnCallback(fn ($arg) => new \DateTime($arg)); - $this->lockManager = new LockManager(OC::$server->get(IDBConnection::class), $this->folderMapper, $this->timeFactory); + $this->lockManager = new LockManager(\OCP\Server::get(IDBConnection::class), $this->folderMapper, $this->timeFactory); $this->lockManager->setLock($this->user, false); } diff --git a/tests/OrphanedTreeItemsRepairStepTest.php b/tests/OrphanedTreeItemsRepairStepTest.php index e98ce4926..3b848ca8c 100644 --- a/tests/OrphanedTreeItemsRepairStepTest.php +++ b/tests/OrphanedTreeItemsRepairStepTest.php @@ -70,15 +70,15 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->repairStep = \OC::$server->get(OrphanedTreeItemsRepairStep::class); - $this->db = \OC::$server->get(\OCP\IDBConnection::class); - $this->treeMapper = \OC::$server->get(Db\TreeMapper::class); - $this->treeCache = \OC::$server->get(Service\TreeCacheManager::class); - $this->bookmarkMapper = \OC::$server->get(Db\BookmarkMapper::class); - $this->folderMapper = \OC::$server->get(Db\FolderMapper::class); - $this->htmlImporter = \OC::$server->get(Service\HtmlImporter::class); - - $this->userManager = \OC::$server->get(IUserManager::class); + $this->repairStep = \OCP\Server::get(OrphanedTreeItemsRepairStep::class); + $this->db = \OCP\Server::get(\OCP\IDBConnection::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); + $this->treeCache = \OCP\Server::get(Service\TreeCacheManager::class); + $this->bookmarkMapper = \OCP\Server::get(Db\BookmarkMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); + $this->htmlImporter = \OCP\Server::get(Service\HtmlImporter::class); + + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/PublicFolderTest.php b/tests/PublicFolderTest.php index 6625f5ef0..34475827b 100644 --- a/tests/PublicFolderTest.php +++ b/tests/PublicFolderTest.php @@ -56,11 +56,11 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->folderPublicMapper = \OC::$server->get(Db\PublicFolderMapper::class); - $this->folderMapper = \OC::$server->get(Db\FolderMapper::class); - $this->treeMapper = \OC::$server->get(Db\TreeMapper::class); + $this->folderPublicMapper = \OCP\Server::get(Db\PublicFolderMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); - $this->userManager = \OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/SettingsControllerTest.php b/tests/SettingsControllerTest.php index 28ce4a0c2..ead26b8df 100644 --- a/tests/SettingsControllerTest.php +++ b/tests/SettingsControllerTest.php @@ -46,7 +46,7 @@ protected function setUp(): void { parent::setUp(); $this->cleanUp(); - $this->userManager = \OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); @@ -54,11 +54,11 @@ protected function setUp(): void { $this->userId = $this->userManager->get($this->user)->getUID(); $this->appName = 'bookmarks'; - $this->request = \OC::$server->get(IRequest::class); + $this->request = \OCP\Server::get(IRequest::class); /** @var IFactory $l10nFactory */ - $l10nFactory = \OC::$server->get(IFactory::class); + $l10nFactory = \OCP\Server::get(IFactory::class); $l = $l10nFactory->get('bookmarks'); - $this->config = \OC::$server->get(IConfig::class); + $this->config = \OCP\Server::get(IConfig::class); $userSettings = \OCP\Server::get(UserSettingsService::class); $userSettings->setUserId($this->userId); if (!$this->userManager->userExists($this->userId)) { diff --git a/tests/TagMapperTest.php b/tests/TagMapperTest.php index 82f1ba28e..86181fb41 100644 --- a/tests/TagMapperTest.php +++ b/tests/TagMapperTest.php @@ -38,12 +38,12 @@ class TagMapperTest extends TestCase { protected function setUp(): void { parent::setUp(); - $this->bookmarkMapper = \OC::$server->get(Db\BookmarkMapper::class); - $this->tagMapper = \OC::$server->get(Db\TagMapper::class); - $this->folderMapper = \OC::$server->get(Db\FolderMapper::class); - $this->treeMapper = \OC::$server->get(Db\TreeMapper::class); + $this->bookmarkMapper = \OCP\Server::get(Db\BookmarkMapper::class); + $this->tagMapper = \OCP\Server::get(Db\TagMapper::class); + $this->folderMapper = \OCP\Server::get(Db\FolderMapper::class); + $this->treeMapper = \OCP\Server::get(Db\TreeMapper::class); - $this->userManager = \OC::$server->get(IUserManager::class); + $this->userManager = \OCP\Server::get(IUserManager::class); $this->user = 'test'; if (!$this->userManager->userExists($this->user)) { $this->userManager->createUser($this->user, 'password'); diff --git a/tests/TestCase.php b/tests/TestCase.php index 3c31ef530..4f6fa46a4 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -29,23 +29,23 @@ class TestCase extends Framework\TestCase { protected function cleanUp(): void { - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_tags'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_tags'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_folders'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_folders'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_root_folders'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_root_folders'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_folders_public'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_folders_public'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_tree'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_tree'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shares'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shares'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shared_folders'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shared_folders'); $query->execute(); - $query = \OC::$server->get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shared_to_shares'); + $query = \OCP\Server::get(IDBConnection::class)->prepare('DELETE FROM *PREFIX*bookmarks_shared_to_shares'); $query->execute(); } }