Remove deprecated IServerContainer

apps/dav/lib/Connector/Sabre/ServerFactory.php

@@ -137,7 +137,12 @@ public function createServer(
 		$server->on('beforeMethod:*', function () use ($server,
 			$tree, $viewCallBack, $isPublicShare, $rootCollection, $debugEnabled): void {
 			// ensure the skeleton is copied
-			$userFolder = \OC::$server->getUserFolder();
+			$userFolder = null;
+			$rootFolder = \OCP\Server::get(IRootFolder::class);
+			$user = $this->userSession->getUser();
+			if ($user !== null) {
+				$userFolder = $rootFolder->getUserFolder($user->getUID());
+			}
 
 			/** @var View $view */
 			$view = $viewCallBack($server);
@@ -188,7 +193,7 @@ public function createServer(
 					$tree,
 					$this->userSession,
 					\OCP\Server::get(\OCP\Share\IManager::class),
-					\OCP\Server::get(IRootFolder::class),
+					$rootFolder,
 				));
 				$server->addPlugin(new CommentPropertiesPlugin(\OCP\Server::get(ICommentsManager::class), $this->userSession));
 				$server->addPlugin(new FilesReportPlugin(
@@ -209,7 +214,7 @@ public function createServer(
 							$server,
 							$tree,
 							$this->databaseConnection,
-							$this->userSession->getUser(),
+							$user,
 							\OCP\Server::get(PropertyMapper::class),
 							\OCP\Server::get(DefaultCalendarValidator::class),
 						)

apps/dav/lib/Server.php

@@ -288,15 +288,17 @@ public function __construct(
 
 		// wait with registering these until auth is handled and the filesystem is setup
 		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
-			// Allow view-only plugin for webdav requests
-			$this->server->addPlugin(new ViewOnlyPlugin(
-				\OC::$server->getUserFolder(),
-			));
-
 			// custom properties plugin must be the last one
 			$userSession = \OCP\Server::get(IUserSession::class);
 			$user = $userSession->getUser();
-			if ($user !== null) {
+			$rootFolder = \OCP\Server::get(IRootFolder::class);
+			if ($user === null) {
+				// Allow view-only plugin for webdav requests
+				$this->server->addPlugin(new ViewOnlyPlugin(null));
+			} else {
+				$userFolder = $rootFolder->getUserFolder($user->getUID());
+				// Allow view-only plugin for webdav requests
+				$this->server->addPlugin(new ViewOnlyPlugin($userFolder));
 				$view = Filesystem::getView();
 				$config = \OCP\Server::get(IConfig::class);
 				$this->server->addPlugin(
@@ -337,13 +339,12 @@ public function __construct(
 				);
 
 				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
 				$shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
 				$this->server->addPlugin(new SharesPlugin(
 					$this->server->tree,
 					$userSession,
 					$shareManager,
-					\OCP\Server::get(IRootFolder::class),
+					$rootFolder,
 				));
 				$this->server->addPlugin(new CommentPropertiesPlugin(
 					\OCP\Server::get(ICommentsManager::class),
@@ -381,7 +382,7 @@ public function __construct(
 						$this->server,
 						$this->server->tree,
 						$user,
-						\OCP\Server::get(IRootFolder::class),
+						$rootFolder,
 						$shareManager,
 						$view,
 						\OCP\Server::get(IFilesMetadataManager::class)

apps/dav/tests/unit/AppInfo/ApplicationTest.php

@@ -27,9 +27,9 @@ public function test(): void {
 		$c = $app->getContainer();
 
 		// assert service instances in the container are properly setup
-		$s = $c->query(ContactsManager::class);
+		$s = $c->get(ContactsManager::class);
 		$this->assertInstanceOf(ContactsManager::class, $s);
-		$s = $c->query(CardDavBackend::class);
+		$s = $c->get(CardDavBackend::class);
 		$this->assertInstanceOf(CardDavBackend::class, $s);
 	}
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php

@@ -9,6 +9,7 @@
 
 namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
 
+use OCP\Files\IRootFolder;
 use OCP\IUserSession;
 use OCP\Server;
 use Sabre\DAV\Auth\Backend\BackendInterface;
@@ -64,7 +65,7 @@ public function check(RequestInterface $request, ResponseInterface $response) {
 			$user = $userSession->getUser()->getUID();
 			\OC_Util::setupFS($user);
 			//trigger creation of user home and /files folder
-			\OC::$server->getUserFolder($user);
+			Server::get(IRootFolder::class)->getUserFolder($user);
 			return [true, "principals/$user"];
 		}
 		return [false, 'login failed'];

apps/files_sharing/lib/Updater.php

@@ -13,8 +13,10 @@
 use OC\Files\Mount\MountPoint;
 use OCP\Constants;
 use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\NotFoundException;
+use OCP\IUserSession;
 use OCP\Server;
 use OCP\Share\IShare;
 
@@ -39,7 +41,11 @@ public static function renameHook($params) {
 	 * @param string $path
 	 */
 	private static function moveShareInOrOutOfShare($path): void {
-		$userFolder = \OC::$server->getUserFolder();
+		$userInSession = Server::get(IUserSession::class)->getUser();
+		if (!$userInSession) {
+			return;
+		}
+		$userFolder = Server::get(IRootFolder::class)->getUserFolder($userInSession->getUID());
 
 		// If the user folder can't be constructed (e.g. link share) just return.
 		if ($userFolder === null) {

apps/files_sharing/tests/ApiTest.php

@@ -86,7 +86,7 @@ protected function setUp(): void {
 		$mount = $this->view->getMount($this->filename);
 		$mount->getStorage()->getScanner()->scan('', Scanner::SCAN_RECURSIVE);
 
-		$this->userFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$this->userFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->appConfig = $this->createMock(IAppConfig::class);
 	}
@@ -870,7 +870,7 @@ public function testGetShareFromFileReReShares(): void {
 		$share1->setStatus(IShare::STATUS_ACCEPTED);
 		$this->shareManager->updateShare($share1);
 
-		$user2Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
+		$user2Folder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
 		$node2 = $user2Folder->get($this->subfolder . $this->filename);
 		$share2 = $this->shareManager->newShare();
 		$share2->setNode($node2)
@@ -882,7 +882,7 @@ public function testGetShareFromFileReReShares(): void {
 		$share2->setStatus(IShare::STATUS_ACCEPTED);
 		$this->shareManager->updateShare($share2);
 
-		$user3Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
+		$user3Folder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
 		$node3 = $user3Folder->get($this->filename);
 		$share3 = $this->shareManager->newShare();
 		$share3->setNode($node3)
@@ -1133,7 +1133,7 @@ public function testDeleteReshare(): void {
 		$share1->setStatus(IShare::STATUS_ACCEPTED);
 		$this->shareManager->updateShare($share1);
 
-		$user2folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
+		$user2folder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
 		$node2 = $user2folder->get($this->folder . '/' . $this->filename);
 		$share2 = $this->shareManager->newShare();
 		$share2->setNode($node2)

apps/files_sharing/tests/CacheTest.php

@@ -68,7 +68,7 @@ protected function setUp(): void {
 		$this->ownerStorage->getScanner()->scan('');
 
 		// share "shareddir" with user2
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 
 		$node = $rootFolder->get('container/shareddir');
 		$share = $this->shareManager->newShare();
@@ -286,7 +286,7 @@ public function testGetFolderContentsInSubdir(): void {
 	public function testShareRenameOriginalFileInRecentResults(): void {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('simplefile.txt');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -302,7 +302,7 @@ public function testShareRenameOriginalFileInRecentResults(): void {
 		$node->move(self::TEST_FILES_SHARING_API_USER1 . '/files/simplefile2.txt');
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
 		$recents = $rootFolder->getRecent(10);
 		self::assertEquals([
 			'welcome.txt',
@@ -313,7 +313,7 @@ public function testShareRenameOriginalFileInRecentResults(): void {
 	public function testGetFolderContentsWhenSubSubdirShared(): void {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('container/shareddir/subdir');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -399,7 +399,7 @@ public function testGetPathByIdDirectShare(): void {
 		Filesystem::file_put_contents('test.txt', 'foo');
 		$info = Filesystem::getFileInfo('test.txt');
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('test.txt');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -430,7 +430,7 @@ public function testGetPathByIdShareSubFolder(): void {
 		$folderInfo = Filesystem::getFileInfo('foo');
 		$fileInfo = Filesystem::getFileInfo('foo/bar/test.txt');
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('foo');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -458,7 +458,7 @@ public function testNumericStorageId(): void {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 		Filesystem::mkdir('foo');
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('foo');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -495,7 +495,7 @@ public function testShareJailedStorage(): void {
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('foo/sub');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -534,7 +534,7 @@ public function testSearchShareJailedStorage(): void {
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('foo/sub');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)
@@ -571,7 +571,7 @@ public function testSingleFileShareKeepsUnmaskedPermissionsAsScanPermissions():
 	public function testFolderShareKeepsUnmaskedPermissionsAsScanPermissions(): void {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
-		$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$rootFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 		$node = $rootFolder->get('container');
 		$share = $this->shareManager->newShare();
 		$share->setNode($node)

apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php

@@ -14,6 +14,7 @@
 use OCA\Files_Trashbin\Storage;
 use OCP\App\IAppManager;
 use OCP\Constants;
+use OCP\Files\IRootFolder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 use OCP\Server;
@@ -125,7 +126,7 @@ private function getShares() {
 	public function testClearShares(): void {
 		$this->loginAsUser($this->user1);
 
-		$user1Folder = \OC::$server->getUserFolder($this->user1);
+		$user1Folder = Server::get(IRootFolder::class)->getUserFolder($this->user1);
 		$testFolder = $user1Folder->newFolder('test');
 		$testSubFolder = $testFolder->newFolder('sub');
 

apps/files_sharing/tests/EtagPropagationTest.php

@@ -256,7 +256,7 @@ public function testOwnerUnshares(): void {
 		$folderInfo = $this->rootView->getFileInfo('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/sub1/sub2/folder');
 		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 
-		$node = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1)->get('/sub1/sub2/folder');
+		$node = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1)->get('/sub1/sub2/folder');
 		$shareManager = Server::get(\OCP\Share\IManager::class);
 		$shares = $shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER1, IShare::TYPE_USER, $node, true);
 
@@ -279,7 +279,7 @@ public function testOwnerUnsharesFlatReshares(): void {
 		$folderInfo = $this->rootView->getFileInfo('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/sub1/sub2/folder/inside');
 		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 
-		$node = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1)->get('/sub1/sub2/folder/inside');
+		$node = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1)->get('/sub1/sub2/folder/inside');
 		$shareManager = Server::get(\OCP\Share\IManager::class);
 		$shares = $shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER1, IShare::TYPE_USER, $node, true);
 

apps/files_trashbin/lib/Command/Expire.php

@@ -8,7 +8,6 @@
 
 namespace OCA\Files_Trashbin\Command;
 
-use OC\Command\FileAccess;
 use OC\Files\SetupManager;
 use OCA\Files_Trashbin\Trashbin;
 use OCP\Command\ICommand;
@@ -20,8 +19,6 @@
 use Psr\Log\LoggerInterface;
 
 class Expire implements ICommand {
-	use FileAccess;
-
 	public function __construct(
 		private readonly string $userId,
 	) {

apps/files_trashbin/lib/Trashbin.php

@@ -668,7 +668,7 @@ private static function restoreVersions(View $view, $file, $filename, $uniqueFil
 	 */
 	public static function deleteAll() {
 		$user = OC_User::getUser();
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
+		$userRoot = Server::get(IRootFolder::class)->getUserFolder($user)->getParent();
 		$view = new View('/' . $user);
 		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
 
@@ -743,7 +743,7 @@ protected static function emitTrashbinPostDelete($path) {
 	 * @return int|float size of deleted files
 	 */
 	public static function delete($filename, $user, $timestamp = null) {
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
+		$userRoot = Server::get(IRootFolder::class)->getUserFolder($user)->getParent();
 		$view = new View('/' . $user);
 		$size = 0;
 

apps/files_trashbin/tests/TrashbinTest.php

@@ -78,7 +78,7 @@ public static function setUpBeforeClass(): void {
 
 		// register trashbin hooks
 		$trashbinApp = new TrashbinApplication();
-		$trashbinApp->boot(new BootContext(new DIContainer('', [], \OC::$server)));
+		$trashbinApp->boot(new BootContext(\OC::$server, new DIContainer('', [], \OC::$server)));
 
 		// create test user
 		self::loginHelper(self::TEST_TRASHBIN_USER2, true);
@@ -218,7 +218,7 @@ public function testExpireOldFilesShared(): void {
 		Filesystem::file_put_contents($folder . 'user1-4.txt', 'file4');
 
 		//share user1-4.txt with user2
-		$node = \OC::$server->getUserFolder(self::TEST_TRASHBIN_USER1)->get($folder);
+		$node = Server::get(IRootFolder::class)->getUserFolder(self::TEST_TRASHBIN_USER1)->get($folder);
 		$share = Server::get(\OCP\Share\IManager::class)->newShare();
 		$share->setShareType(IShare::TYPE_USER)
 			->setNode($node)

apps/files_versions/lib/Command/Expire.php

@@ -8,7 +8,6 @@
 
 namespace OCA\Files_Versions\Command;
 
-use OC\Command\FileAccess;
 use OCA\Files_Versions\Storage;
 use OCP\Command\ICommand;
 use OCP\Files\StorageNotAvailableException;
@@ -17,8 +16,6 @@
 use Psr\Log\LoggerInterface;
 
 class Expire implements ICommand {
-	use FileAccess;
-
 	public function __construct(
 		private string $user,
 		private string $fileName,