From 970242b6ca79a0dbb1ac1a868c7b82c7aa49bd8a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 8 Oct 2018 01:50:17 +0200 Subject: RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server Signed-off-by: Georg Ehrke --- lib/private/Calendar/Resource/Manager.php | 15 ++++++++++++++- lib/private/Calendar/Room/Manager.php | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) (limited to 'lib/private') diff --git a/lib/private/Calendar/Resource/Manager.php b/lib/private/Calendar/Resource/Manager.php index 04ef69d69ea..224ca2a4390 100644 --- a/lib/private/Calendar/Resource/Manager.php +++ b/lib/private/Calendar/Resource/Manager.php @@ -24,15 +24,28 @@ namespace OC\Calendar\Resource; use OCP\Calendar\Resource\IBackend; +use OCP\IServerContainer; class Manager implements \OCP\Calendar\Resource\IManager { + /** @var IServerContainer */ + private $server; + /** @var string[] holds all registered resource backends */ private $backends = []; /** @var IBackend[] holds all backends that have been initialized already */ private $initializedBackends = []; + /** + * Manager constructor. + * + * @param IServerContainer $server + */ + public function __construct(IServerContainer $server) { + $this->server = $server; + } + /** * Registers a resource backend * @@ -66,7 +79,7 @@ class Manager implements \OCP\Calendar\Resource\IManager { continue; } - $this->initializedBackends[$backend] = \OC::$server->query($backend); + $this->initializedBackends[$backend] = $this->server->query($backend); } return array_values($this->initializedBackends); diff --git a/lib/private/Calendar/Room/Manager.php b/lib/private/Calendar/Room/Manager.php index 8664149549d..d73b52cfb16 100644 --- a/lib/private/Calendar/Room/Manager.php +++ b/lib/private/Calendar/Room/Manager.php @@ -24,15 +24,28 @@ namespace OC\Calendar\Room; use OCP\Calendar\Room\IBackend; +use OCP\IServerContainer; class Manager implements \OCP\Calendar\Room\IManager { + /** @var IServerContainer */ + private $server; + /** @var string[] holds all registered resource backends */ private $backends = []; /** @var IBackend[] holds all backends that have been initialized already */ private $initializedBackends = []; + /** + * Manager constructor. + * + * @param IServerContainer $server + */ + public function __construct(IServerContainer $server) { + $this->server = $server; + } + /** * Registers a resource backend * @@ -66,7 +79,7 @@ class Manager implements \OCP\Calendar\Room\IManager { continue; } - $this->initializedBackends[$backend] = \OC::$server->query($backend); + $this->initializedBackends[$backend] = $this->server->query($backend); } return array_values($this->initializedBackends); -- cgit v1.2.3