Merge pull request #31992 from owncloud/stable10-empty-path-has-no-pa…

…rents [stable10] empty path has no parents
owncloud · Jul 18, 2018 · 927d907 · 927d907
2 parents 404624c + 42a71c9
commit 927d907
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
@@ -63,6 +63,10 @@ public function propagateChange($internalPath, $time, $sizeDifference = 0) {
 
 		$parents = $this->getParents($internalPath);
 
+		if (\count($parents) === 0) {
+			return;
+		}
+
 		if ($this->inBatch) {
 			foreach ($parents as $parent) {
 				$this->addToBatch($parent, $time, $sizeDifference);
@@ -100,6 +104,9 @@ public function propagateChange($internalPath, $time, $sizeDifference = 0) {
 	}
 
 	protected function getParents($path) {
+		if ($path === '') {
+			return [];
+		}
 		$parts = explode('/', $path);
 		$parent = '';
 		$parents = [];

diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php
@@ -81,6 +81,25 @@ public function testSizePropagation() {
 		}
 	}
 
+	public function getParentsProvider() {
+		return [
+			['', []],
+			['foo', ['']],
+			['foo/bar', ['', 'foo']],
+			['foo/bar/baz.txt', ['', 'foo', 'foo/bar']]
+		];
+	}
+
+	/**
+	 * @dataProvider getParentsProvider
+	 * @param $path
+	 * @throws \OCP\Files\StorageNotAvailableException
+	 */
+	public function testGetParents($path, $expected) {
+		$propagator = $this->storage->getPropagator();
+		self::assertSame($expected, self::invokePrivate($propagator, 'getParents', [$path]));
+	}
+
 	public function testBatchedPropagation() {
 		$this->storage->mkdir('foo/baz');
 		$this->storage->mkdir('asd');