From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 19 Dec 2016 18:53:35 +0000 (+0100)
Subject: Only check for local shared storages
X-Git-Tag: v12.0.0beta1~709^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00b17c3af5544b01d7834aa4c8a95c7b3bbf95ca;p=nextcloud-server.git

Only check for local shared storages

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

diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index 3794e316dfe..98e2c3c8ca2 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -31,6 +31,7 @@ use OC\Files\Filesystem;
 use OC\ForbiddenException;
 use OC\Hooks\PublicEmitter;
 use OC\Lock\DBLockingProvider;
+use OCA\Files_Sharing\SharedStorage;
 use OCP\Files\Storage\IStorage;
 use OCP\Files\StorageNotAvailableException;
 use OCP\ILogger;
@@ -128,7 +129,7 @@ class Scanner extends PublicEmitter {
 			}
 
 			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+			if ($storage->instanceOfStorage(SharedStorage::class)) {
 				continue;
 			}
 			$scanner = $storage->getScanner();
@@ -178,7 +179,7 @@ class Scanner extends PublicEmitter {
 			}
 
 			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+			if ($storage->instanceOfStorage(SharedStorage::class)) {
 				continue;
 			}
 			$relativePath = $mount->getInternalPath($dir);
diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index 6d6007551ce..1379bc2e906 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -11,6 +11,7 @@ namespace Test\Files\Utils;
 use OC\Files\Filesystem;
 use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\Temporary;
+use OCA\Files_Sharing\SharedStorage;
 use OCP\Files\Config\IMountProvider;
 use OCP\Files\Storage\IStorageFactory;
 use OCP\IUser;
@@ -190,14 +191,14 @@ class ScannerTest extends \Test\TestCase {
 	}
 
 	public function testSkipLocalShares() {
-		$sharedStorage = $this->createMock('OCA\Files_Sharing\SharedStorage');
+		$sharedStorage = $this->createMock(SharedStorage::class);
 		$sharedMount = new MountPoint($sharedStorage, '/share');
 		Filesystem::getMountManager()->addMount($sharedMount);
 
 		$sharedStorage->expects($this->any())
 			->method('instanceOfStorage')
 			->will($this->returnValueMap([
-				['OCA\Files_Sharing\ISharedStorage', true],
+				[SharedStorage::class, true],
 			]));
 		$sharedStorage->expects($this->never())
 			->method('getScanner');