Merge pull request #1385 from sabre-io/fix/tree-mark-dirty-strpos-int

fix: ensure first argument on strpos is a string
sabre-io · Jan 20, 2022 · 53e4229 · 53e4229
2 parents 1f9bfa7 + fec8f14
commit 53e4229
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
@@ -226,7 +226,7 @@ public function markDirty($path)
         // flushing the entire cache
         $path = trim($path, '/');
         foreach ($this->cache as $nodePath => $node) {
-            if ('' === $path || $nodePath == $path || 0 === strpos($nodePath, $path.'/')) {
+            if ('' === $path || $nodePath == $path || 0 === strpos((string) $nodePath, $path.'/')) {
                 unset($this->cache[$nodePath]);
             }
         }

diff --git a/tests/Sabre/DAV/TreeTest.php b/tests/Sabre/DAV/TreeTest.php
@@ -58,6 +58,15 @@ public function testDeepMove()
         $this->assertTrue($tree->getNodeForPath('hi/sub')->isDeleted);
     }
 
+    public function testDeepMoveNumber()
+    {
+        $tree = new TreeMock();
+        $tree->move('1/2', 'hi/sub');
+
+        $this->assertArrayHasKey('sub', $tree->getNodeForPath('hi')->newDirectories);
+        $this->assertTrue($tree->getNodeForPath('1/2')->isDeleted);
+    }
+
     public function testDelete()
     {
         $tree = new TreeMock();
@@ -114,6 +123,9 @@ public function __construct()
                     new TreeFileTester('2'),
                     new TreeFileTester('3'),
                 ]),
+                new TreeDirectoryTester('1', [
+                    new TreeDirectoryTester('2'),
+                ]),
             ])
         );
     }
@@ -169,7 +181,7 @@ class TreeFileTester extends File implements IProperties
 {
     public $name;
     public $data;
-    public $properties;
+    public $properties = [];
 
     public function __construct($name, $data = null)
     {