Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
index f37ffc19e290a665ed650a9d3c69a51579e76342..bd2da1d25b29fc92bfcdaceafedfa7b5f30e35bb 100644 (file)
--- a/apps/dav/lib/Connector/Sabre/ObjectTree.php
+++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php
@@ -160,7 +160,7 @@ class ObjectTree extends \Sabre\DAV\Tree {
                        try {
                                $info = $this->fileView->getFileInfo($path);
 
-                               if ($info->getStorage()->instanceOfStorage(FailedStorage::class)) {
+                               if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
                                        throw new StorageNotAvailableException();
                                }
                        } catch (StorageNotAvailableException $e) {

diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index 53f60bd0f1c2d053f6dabc72fba93bf4e837c704..efb6d88ae575bdf0a8cc22994b69e4da1b9bf424 100644 (file)
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -174,6 +174,8 @@ class ObjectTreeTest extends \Test\TestCase {
                $fileInfo->expects($this->once())
                        ->method('getName')
                        ->will($this->returnValue($outputFileName));
+               $fileInfo->method('getStorage')
+                       ->willReturn($this->createMock(\OC\Files\Storage\Common::class));
 
                $view->expects($this->once())
                        ->method('getFileInfo')