nextcloud · marcelklehr · Jun 10, 2026 · Jun 10, 2026 · Jun 10, 2026 · Jun 10, 2026
diff --git 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
+          cat data/nextcloud.log
diff --git 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
@@ -23,7 +23,7 @@ Requirements:
    - mbstring: *
  - when using MySQL, use at least v8.0
 ]]></description>
-	<version>16.1.4</version>
+	<version>16.2.0-dev.0</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net" homepage="https://marcelklehr.de">Marcel Klehr</author>
 	<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
@@ -42,7 +42,7 @@ Requirements:
 		<database>pgsql</database>
 		<lib>intl</lib>
 		<lib>mbstring</lib>
-		<nextcloud min-version="32" max-version="33" />
+		<nextcloud min-version="32" max-version="34" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>

diff --git 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('/<link rel="manifest" href="(.*?)">/i', '<link rel="manifest" href="' . OC::$server->getURLGenerator()->linkToRouteAbsolute('bookmarks.web_view.manifest') . '">', $return);
+		preg_replace('/<link rel="manifest" href="(.*?)">/i', '<link rel="manifest" href="' . \OCP\Server::get(IUrlGenerator::class)->linkToRouteAbsolute('bookmarks.web_view.manifest') . '">', $return);
 		return $return;
 	}
 }
diff --git 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
@@ -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
@@ -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
@@ -22,6 +22,11 @@
       <code><![CDATA[$this->folderController->getFolders()->getData()]]></code>
     </UndefinedMethod>
   </file>
+  <file src="lib/Db/BookmarkMapper.php">
+    <ReservedWord>
+      <code><![CDATA[Folder]]></code>
+    </ReservedWord>
+  </file>
   <file src="lib/Db/TreeMapper.php">
     <InvalidReturnStatement>
       <code><![CDATA[$this->bookmarkMapper->findAll($userId, $params)]]></code>
@@ -48,6 +53,9 @@
     <InvalidTemplateParam>
       <code><![CDATA[ExportResponse]]></code>
     </InvalidTemplateParam>
+    <UndefinedClass>
+      <code><![CDATA[ThemingDefaults]]></code>
+    </UndefinedClass>
   </file>
   <file src="lib/Flow/CreateBookmark.php">
     <UndefinedClass>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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))
 				);
 		}