]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #46368 from nextcloud/fix/task-processing
authorMarcel Klehr <mklehr@gmx.net>
Fri, 19 Jul 2024 10:38:30 +0000 (12:38 +0200)
committerGitHub <noreply@github.com>
Fri, 19 Jul 2024 10:38:30 +0000 (12:38 +0200)
TaskProcessing follow-up

1  2 
core/openapi-full.json
lib/private/TaskProcessing/Manager.php
tests/lib/TaskProcessing/TaskProcessingTest.php

Simple merge
index f720776a239b5ace1c2a9e44c6b1492d8580401a,821fac01b9970d5856ceb7c5d0f54c68fa435bd8..d5a09ff2472eda89081a76472323434ffa1803d8
@@@ -21,10 -22,11 +22,12 @@@ use OCP\Files\Config\IUserMountCache
  use OCP\Files\File;
  use OCP\Files\GenericFileException;
  use OCP\Files\IAppData;
+ use OCP\Files\InvalidPathException;
  use OCP\Files\IRootFolder;
+ use OCP\Files\Node;
  use OCP\Files\NotPermittedException;
  use OCP\Files\SimpleFS\ISimpleFile;
 +use OCP\IConfig;
  use OCP\IL10N;
  use OCP\IServerContainer;
  use OCP\L10N\IFactory;
index a1857fad1b3529656202c63e893e386f81473999,699a7d6b2c227b641c2a9bf82e8504b5bcbe5723..27f46bed17c44c8bb780d980d32c442068ea8482
@@@ -370,10 -371,9 +371,10 @@@ class TaskProcessingTest extends \Test\
                        \OC::$server->get(IAppDataFactory::class),
                );
  
-               $this->shareManager = $this->createMock(\OCP\Share\IManager::class);
+               $this->userMountCache = $this->createMock(IUserMountCache::class);
  
                $this->manager = new Manager(
 +                      \OC::$server->get(IConfig::class),
                        $this->coordinator,
                        $this->serverContainer,
                        \OC::$server->get(LoggerInterface::class),