diff options
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 8 | ||||
| -rw-r--r-- | tests/lib/Files/Node/FolderTest.php | 36 |
2 files changed, 38 insertions, 6 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 868906c82d1..81ca7e254d9 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -119,10 +119,11 @@ class Folder extends Node implements \OCP\Files\Folder { } else { $isDir = $info->getType() === FileInfo::TYPE_FOLDER; } + $parent = dirname($path) === $this->getPath() ? $this : null; if ($isDir) { - return new Folder($this->root, $this->view, $path, $info); + return new Folder($this->root, $this->view, $path, $info, $parent); } else { - return new File($this->root, $this->view, $path, $info); + return new File($this->root, $this->view, $path, $info, $parent); } } @@ -163,7 +164,8 @@ class Folder extends Node implements \OCP\Files\Folder { if (!$this->view->mkdir($fullPath)) { throw new NotPermittedException('Could not create folder'); } - $node = new Folder($this->root, $this->view, $fullPath, null, $this); + $parent = dirname($fullPath) === $this->getPath() ? $this : null; + $node = new Folder($this->root, $this->view, $fullPath, null, $parent); $this->sendHooks(['postWrite', 'postCreate'], [$node]); return $node; } else { diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php index 2be0257aacb..ddf6c412dcd 100644 --- a/tests/lib/Files/Node/FolderTest.php +++ b/tests/lib/Files/Node/FolderTest.php @@ -14,6 +14,7 @@ use OC\Files\Config\CachedMountInfo; use OC\Files\FileInfo; use OC\Files\Mount\Manager; use OC\Files\Mount\MountPoint; +use OC\Files\Node\File; use OC\Files\Node\Folder; use OC\Files\Node\Node; use OC\Files\Node\Root; @@ -105,11 +106,13 @@ class FolderTest extends NodeTest { ->method('getUser') ->willReturn($this->user); + $node = new File($root, $view, '/bar/foo/asd'); $root->method('get') - ->with('/bar/foo/asd'); + ->with('/bar/foo/asd') + ->willReturn($node); - $node = new Folder($root, $view, '/bar/foo'); - $node->get('asd'); + $parentNode = new Folder($root, $view, '/bar/foo'); + self::assertEquals($node, $parentNode->get('asd')); } public function testNodeExists() { @@ -183,6 +186,33 @@ class FolderTest extends NodeTest { $this->assertEquals($child, $result); } + public function testNewFolderDeepParent() { + $manager = $this->createMock(Manager::class); + /** + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view + */ + $view = $this->createMock(View::class); + $root = $this->getMockBuilder(Root::class) + ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher]) + ->getMock(); + $root->expects($this->any()) + ->method('getUser') + ->willReturn($this->user); + + $view->method('getFileInfo') + ->with('/foobar') + ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL])); + + $view->method('mkdir') + ->with('/foobar/asd/sdf') + ->willReturn(true); + + $node = new Folder($root, $view, '/foobar'); + $child = new Folder($root, $view, '/foobar/asd/sdf', null, null); + $result = $node->newFolder('asd/sdf'); + $this->assertEquals($child, $result); + } + public function testNewFolderNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); |