pass getNodeForPath requests to sub trees

sabre-io · May 25, 2018 · 02f6996 · 02f6996
1 parent c1ce98f
commit 02f6996
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
@@ -67,8 +67,13 @@ function getNodeForPath($path) {
             if (!($node instanceof ICollection))
                 throw new Exception\NotFound('Could not find node at path: ' . $path);
 
-            $part = array_shift($parts);
-            if ($part !== '') $node = $node->getChild($part);
+            if ($node instanceof self) {
+                $node = $node->getNodeForPath(implode('/', $parts));
+                break;
+            } else {
+                $part = array_shift($parts);
+                if ($part !== '') $node = $node->getChild($part);
+            }
         }
 
         $this->cache[$path] = $node;

diff --git a/tests/Sabre/DAV/TreeTest.php b/tests/Sabre/DAV/TreeTest.php
@@ -97,6 +97,13 @@ function testGetMultipleNodes2() {
 
     }
 
+    function testGetSubTreeNode() {
+
+        $tree = new TreeMock();
+        $this->assertTrue($tree->nodeExists('subtree/sub/1'));
+
+    }
+
 }
 
 class TreeMock extends Tree {
@@ -119,7 +126,12 @@ function __construct() {
                     new TreeFileTester('1'),
                     new TreeFileTester('2'),
                     new TreeFileTester('3'),
-                ])
+                ]),
+                new Tree(new TreeDirectoryTester('subtree', [
+                    new TreeDirectoryTester('sub', [
+                        new TreeFileTester('1')
+                    ]),
+                ]))
             ])
         );