fix tests

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Feb 7, 2023 · 7fd96c2 · 7fd96c2
1 parent e3bafcc
commit 7fd96c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
@@ -200,7 +200,11 @@ public function getStorage() {
 	 */
 	public function getStorageId() {
 		if (!$this->storageId) {
-			$this->storageId = $this->getStorage()->getId();
+			$storage = $this->getStorage();
+			if (is_null($storage)) {
+				return null;
+			}
+			$this->storageId = $storage->getId();
 			if (strlen($this->storageId) > 64) {
 				$this->storageId = md5($this->storageId);
 			}
@@ -213,7 +217,11 @@ public function getStorageId() {
 	 */
 	public function getNumericStorageId() {
 		if (is_null($this->numericStorageId)) {
-			$this->numericStorageId = $this->getStorage()->getStorageCache()->getNumericId();
+			$storage = $this->getStorage();
+			if (is_null($storage)) {
+				return null;
+			}
+			$this->numericStorageId = $storage->getStorageCache()->getNumericId();
 		}
 		return $this->numericStorageId;
 	}

diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
@@ -1590,6 +1590,9 @@ private function createTestMovableMountPoints($mountPoints) {
 				->setConstructorArgs([[]])
 				->getMock();
 			$storage->method('getId')->willReturn('non-null-id');
+			$storage->method('getStorageCache')->willReturnCallback(function () use ($storage) {
+				return new \OC\Files\Cache\Storage($storage);
+			});
 
 			$mounts[] = $this->getMockBuilder(TestMoveableMountPoint::class)
 				->setMethods(['moveMount'])