RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

2 files changed, 28 insertions, 2 deletions

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,9 +24,13 @@
 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 = [];
 
@@ -34,6 +38,15 @@ class Manager implements \OCP\Calendar\Resource\IManager {
 	private $initializedBackends = [];
 
 	/**
+	 * Manager constructor.
+	 *
+	 * @param IServerContainer $server
+	 */
+	public function __construct(IServerContainer $server) {
+		$this->server = $server;
+	}
+
+	/**
 	 * Registers a resource backend
 	 *
 	 * @param string $backendClass
@@ -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,9 +24,13 @@
 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 = [];
 
@@ -34,6 +38,15 @@ class Manager implements \OCP\Calendar\Room\IManager {
 	private $initializedBackends = [];
 
 	/**
+	 * Manager constructor.
+	 *
+	 * @param IServerContainer $server
+	 */
+	public function __construct(IServerContainer $server) {
+		$this->server = $server;
+	}
+
+	/**
 	 * Registers a resource backend
 	 *
 	 * @param string $backendClass
@@ -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);