diff options
| -rw-r--r-- | appinfo/application.php | 7 | ||||
| -rw-r--r-- | environment/environment.php | 19 | ||||
| -rw-r--r-- | tests/unit/environment/EnvironmentTest.php | 10 |
3 files changed, 10 insertions, 26 deletions
diff --git a/appinfo/application.php b/appinfo/application.php index c212a372..436204d9 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -204,11 +204,6 @@ class Application extends App { * Core */ $container->registerService( - 'OCP\IServerContainer', function (IAppContainer $c) { - return $c->getServer(); - } - ); - $container->registerService( 'EventSource', function (IAppContainer $c) { return new EventSource(); } @@ -262,7 +257,7 @@ class Application extends App { $c->query('UserId'), $c->query('UserFolder'), $c->query('OCP\IUserManager'), - $c->query('OCP\IServerContainer'), + $c->query('OCP\Files\IRootFolder'), $c->query('Logger') ); } diff --git a/environment/environment.php b/environment/environment.php index d5ee2385..69600d32 100644 --- a/environment/environment.php +++ b/environment/environment.php @@ -14,10 +14,10 @@ namespace OCA\Gallery\Environment; -use OCP\IServerContainer; use OCP\IUserManager; use OCP\Share; use OCP\ILogger; +use OCP\Files\IRootFolder; use OCP\Files\Folder; use OCP\Files\Node; use OCP\Files\File; @@ -26,8 +26,6 @@ use OCP\Files\NotFoundException; /** * Builds the environment so that the services have access to the files and folders' owner * - * @todo remove the serverContainer once OCP\IUserManager has a getUserFolder() method - * * @package OCA\Gallery\Environment */ class Environment { @@ -61,9 +59,9 @@ class Environment { */ private $sharedNodeId; /** - * @var IServerContainer + * @var IRootFolder */ - private $serverContainer; + private $rootFolder; /** * @var ILogger */ @@ -95,7 +93,7 @@ class Environment { * @param string|null $userId * @param Folder|null $userFolder * @param IUserManager $userManager - * @param IServerContainer $serverContainer + * @param IRootFolder $rootFolder * @param ILogger $logger */ public function __construct( @@ -103,14 +101,14 @@ class Environment { $userId, $userFolder, IUserManager $userManager, - IServerContainer $serverContainer, + IRootFolder $rootFolder, ILogger $logger ) { $this->appName = $appName; $this->userId = $userId; $this->userFolder = $userFolder; $this->userManager = $userManager; - $this->serverContainer = $serverContainer; + $this->rootFolder = $rootFolder; $this->logger = $logger; } @@ -123,10 +121,7 @@ class Environment { // Resolves reshares down to the last real share $rootLinkItem = Share::resolveReShare($linkItem); $origShareOwner = $rootLinkItem['uid_owner']; - $this->userFolder = $this->serverContainer->getUserFolder($origShareOwner); - // TODO: Replace with this in 8.2 (https://github.com/owncloud/core/pull/16965) - // You get root by calling getRootFolder() on the server container - //$this->userFolder = $this->root->getUserFolder($origShareOwner); + $this->userFolder = $this->rootFolder->getUserFolder($origShareOwner); // This is actually the node ID $this->sharedNodeId = $linkItem['file_source']; diff --git a/tests/unit/environment/EnvironmentTest.php b/tests/unit/environment/EnvironmentTest.php index f713d016..4623d9d5 100644 --- a/tests/unit/environment/EnvironmentTest.php +++ b/tests/unit/environment/EnvironmentTest.php @@ -12,11 +12,9 @@ namespace OCA\Gallery\Environment; -use OCP\IServerContainer; use OCP\IUserManager; use OCP\ILogger; use OCP\Files\IRootFolder; -use OCP\Files\Folder; use OCP\AppFramework\IAppContainer; @@ -37,8 +35,6 @@ class EnvironmentTest extends \Test\TestCase { private $rootFolder; /** @var IUserManager */ private $userManager; - /** @var IServerContainer */ - private $serverContainer; /** @var ILogger */ private $logger; /** @var Environment */ @@ -52,12 +48,10 @@ class EnvironmentTest extends \Test\TestCase { $app = new Application(); $this->container = $app->getContainer(); - $this->rootFolder = $this->container->getServer() - ->getRootFolder(); $this->userManager = $this->getMockBuilder('\OCP\IUserManager') ->disableOriginalConstructor() ->getMock(); - $this->serverContainer = $this->getMockBuilder('OCP\IServerContainer') + $this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder') ->disableOriginalConstructor() ->getMock(); $this->logger = $this->getMockBuilder('\OCP\ILogger') @@ -96,7 +90,7 @@ class EnvironmentTest extends \Test\TestCase { $userId, $userFolder, $this->userManager, - $this->serverContainer, + $this->rootFolder, $this->logger ); } |