Merge pull request #40123 from summersab/refactor/OC-Server-getRootFo…

…lder
nextcloud · Mar 15, 2024 · 6b4d918 · 6b4d918
2 parents 4905331 + 3f560ae
commit 6b4d918
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php
@@ -32,6 +32,7 @@
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\InvalidPathException;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\IRequest;
@@ -118,7 +119,7 @@ public function addDirRecursive(string $dir, string $internalDir = ''): void {
 		// prevent absolute dirs
 		$internalDir = ltrim($internalDir, '/');
 
-		$userFolder = \OC::$server->getRootFolder()->get(Filesystem::getRoot());
+		$userFolder = \OC::$server->get(IRootFolder::class)->get(Filesystem::getRoot());
 		/** @var Folder $dirNode */
 		$dirNode = $userFolder->get($dir);
 		$files = $dirNode->getDirectoryListing();

diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php
@@ -46,6 +46,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\BeforeDirectFileDownloadEvent;
 use OCP\Files\Events\BeforeZipCreatedEvent;
+use OCP\Files\IRootFolder;
 use OCP\Lock\ILockingProvider;
 
 /**
@@ -187,7 +188,7 @@ public static function get($dir, $files, $params = null) {
 				foreach ($files as $file) {
 					$file = $dir . '/' . $file;
 					if (\OC\Files\Filesystem::is_file($file)) {
-						$userFolder = \OC::$server->getRootFolder()->get(\OC\Files\Filesystem::getRoot());
+						$userFolder = \OC::$server->get(IRootFolder::class)->get(\OC\Files\Filesystem::getRoot());
 						$file = $userFolder->get($file);
 						if ($file instanceof \OC\Files\Node\File) {
 							try {
@@ -307,7 +308,7 @@ private static function getSingleFile($view, $dir, $name, $params) {
 		$file = null;
 
 		try {
-			$userFolder = \OC::$server->getRootFolder()->get(\OC\Files\Filesystem::getRoot());
+			$userFolder = \OC::$server->get(IRootFolder::class)->get(\OC\Files\Filesystem::getRoot());
 			$file = $userFolder->get($filename);
 			if (!$file instanceof \OC\Files\Node\File || !$file->isReadable()) {
 				http_response_code(403);

diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -84,7 +84,7 @@ protected function setUp(): void {
 
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->previewManager = \OC::$server->getPreviewManager();
-		$this->rootFolder = \OC::$server->getRootFolder();
+		$this->rootFolder = \OC::$server->get(IRootFolder::class);
 		$this->mimeTypeLoader = \OC::$server->getMimeTypeLoader();
 		$this->timeFactory = \OCP\Server::get(ITimeFactory::class);
 	}
@@ -102,7 +102,7 @@ protected function tearDown(): void {
 
 	private function getRoot(): Root {
 		return new Root(
-			\OC::$server->getRootFolder(),
+			\OC::$server->get(IRootFolder::class),
 			\OC::$server->getSystemConfig()
 		);
 	}

diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php
@@ -22,6 +22,7 @@
 namespace Test\Preview;
 
 use OC\Files\Node\File;
+use OCP\Files\IRootFolder;
 
 abstract class Provider extends \Test\TestCase {
 	/** @var string */
@@ -137,7 +138,7 @@ protected function prepareTestFile($fileName, $fileContent) {
 	 * @return bool|\OCP\IImage
 	 */
 	private function getPreview($provider) {
-		$file = new File(\OC::$server->getRootFolder(), $this->rootView, $this->imgPath);
+		$file = new File(\OC::$server->get(IRootFolder::class), $this->rootView, $this->imgPath);
 		$preview = $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp);
 
 		if (get_class($this) === BitmapTest::class && $preview === null) {

diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -2514,7 +2514,7 @@ public function testUserDeletedFromGroup($group, $user, $toDelete) {
 	public function testGetSharesInFolder() {
 		$userManager = \OC::$server->getUserManager();
 		$groupManager = \OC::$server->getGroupManager();
-		$rootFolder = \OC::$server->getRootFolder();
+		$rootFolder = \OC::$server->get(IRootFolder::class);
 
 		$provider = new DefaultShareProvider(
 			$this->dbConn,
@@ -2612,7 +2612,7 @@ public function testGetSharesInFolder() {
 	public function testGetAccessListNoCurrentAccessRequired() {
 		$userManager = \OC::$server->getUserManager();
 		$groupManager = \OC::$server->getGroupManager();
-		$rootFolder = \OC::$server->getRootFolder();
+		$rootFolder = \OC::$server->get(IRootFolder::class);
 
 		$provider = new DefaultShareProvider(
 			$this->dbConn,
@@ -2708,7 +2708,7 @@ public function testGetAccessListNoCurrentAccessRequired() {
 	public function testGetAccessListCurrentAccessRequired() {
 		$userManager = \OC::$server->getUserManager();
 		$groupManager = \OC::$server->getGroupManager();
-		$rootFolder = \OC::$server->getRootFolder();
+		$rootFolder = \OC::$server->get(IRootFolder::class);
 
 		$provider = new DefaultShareProvider(
 			$this->dbConn,