wip: try to fix webdav propfinds with depth > 1

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 14, 2023 · 248c224 · 248c224
1 parent 5ee5847
commit 248c224
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -102,7 +102,7 @@ public function getDirectoryListing() {
 
 		return array_map(function (FileInfo $info) {
 			if ($info->getMimetype() === FileInfo::MIMETYPE_FOLDER) {
-				return new Folder($this->root, $this->view, $info->getPath(), $info, $this);
+				return new Folder($this->root, $this->view, $this->view->getRelativePath($info->getPath()), $info, $this);
 			} else {
 				return new File($this->root, $this->view, $info->getPath(), $info, $this);
 			}

diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
@@ -79,6 +79,10 @@ public function testGetDirectoryContent() {
 				new FileInfo('/bar/foo/asd', null, 'foo/asd', ['fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'], null),
 				new FileInfo('/bar/foo/qwerty', null, 'foo/qwerty', ['fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory'], null),
 			]);
+		$view->method('getRelativePath')
+			->willReturnCallback(function ($path) {
+				return $path;
+			});
 		$view->method('getFileInfo')
 			->willReturn($this->createMock(FileInfo::class));