diff options
| -rw-r--r-- | apps/files/lib/BackgroundJob/ScanFiles.php | 7 | ||||
| -rw-r--r-- | apps/files/tests/BackgroundJob/ScanFilesTest.php | 3 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Check/FileSystemTags.php | 4 | ||||
| -rw-r--r-- | tests/lib/Files/Utils/ScannerTest.php | 20 |
4 files changed, 5 insertions, 29 deletions
diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index 250338e1262..84846b9b55d 100644 --- a/apps/files/lib/BackgroundJob/ScanFiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php @@ -30,7 +30,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IDBConnection; use OCP\ILogger; -use OCP\IUserManager; /** * Class ScanFiles is a background job used to run the file scanner over the user @@ -57,10 +56,10 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob { * @param IDBConnection $connection */ public function __construct( - IConfig $config, + IConfig $config, IEventDispatcher $dispatcher, - ILogger $logger, - IDBConnection $connection + ILogger $logger, + IDBConnection $connection ) { // Run once per 10 minutes $this->setInterval(60 * 10); diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index f1fb505fe53..04eeff4a30b 100644 --- a/apps/files/tests/BackgroundJob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php @@ -30,7 +30,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\ILogger; use OCP\IUser; -use OCP\IUserManager; use Test\TestCase; use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; @@ -54,7 +53,6 @@ class ScanFilesTest extends TestCase { parent::setUp(); $config = $this->createMock(IConfig::class); - $userManager = $this->createMock(IUserManager::class); $dispatcher = $this->createMock(IEventDispatcher::class); $logger = $this->createMock(ILogger::class); $connection = \OC::$server->getDatabaseConnection(); @@ -63,7 +61,6 @@ class ScanFilesTest extends TestCase { $this->scanFiles = $this->getMockBuilder('\OCA\Files\BackgroundJob\ScanFiles') ->setConstructorArgs([ $config, - $userManager, $dispatcher, $logger, $connection, diff --git a/apps/workflowengine/lib/Check/FileSystemTags.php b/apps/workflowengine/lib/Check/FileSystemTags.php index a879a8e1703..c5f32bbb4e7 100644 --- a/apps/workflowengine/lib/Check/FileSystemTags.php +++ b/apps/workflowengine/lib/Check/FileSystemTags.php @@ -135,8 +135,8 @@ class FileSystemTags implements ICheck, IFileCheck { // TODO: Fix caching inside group folders // Do not cache file ids inside group folders because multiple file ids might be mapped to // the same combination of cache id + path. - $shouldCacheFileIds = !$this->storage - ->instanceOfStorage(\OCA\GroupFolders\Mount\GroupFolderStorage::class); + /** @psalm-suppress InvalidArgument */ + $shouldCacheFileIds = !$this->storage->instanceOfStorage(\OCA\GroupFolders\Mount\GroupFolderStorage::class); $cacheId = $cache->getNumericStorageId(); if ($shouldCacheFileIds && isset($this->fileIds[$cacheId][$path])) { return $this->fileIds[$cacheId][$path]; diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php index abd72416ffd..414d38bae06 100644 --- a/tests/lib/Files/Utils/ScannerTest.php +++ b/tests/lib/Files/Utils/ScannerTest.php @@ -11,7 +11,6 @@ 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\EventDispatcher\IEventDispatcher; use OCP\Files\Config\IMountProvider; use OCP\Files\Storage\IStorageFactory; @@ -192,25 +191,6 @@ class ScannerTest extends \Test\TestCase { $this->assertNotEquals($oldRoot->getEtag(), $newRoot->getEtag()); } - public function testSkipLocalShares() { - $sharedStorage = $this->createMock(SharedStorage::class); - $sharedMount = new MountPoint($sharedStorage, '/share'); - Filesystem::getMountManager()->addMount($sharedMount); - - $sharedStorage->method('instanceOfStorage') - ->willReturnCallback(function (string $c) { - return $c === SharedStorage::class; - }); - $sharedStorage->expects($this->never()) - ->method('getScanner'); - - $scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), $this->createMock(IEventDispatcher::class), \OC::$server->getLogger()); - $scanner->addMount($sharedMount); - $scanner->scan(''); - - $scanner->backgroundScan(''); - } - public function testShallow() { $storage = new Temporary([]); $mount = new MountPoint($storage, ''); |