Use DI

* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP

3 files changed, 18 insertions, 7 deletions

diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 927b6d43302..c66b792064d 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -96,6 +96,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getMemCacheFactory();
 		});
 
+		$this->registerService('OC\\CapabilitiesManager', function($c) {
+			return $this->getServer()->getCapabilitiesManager();
+		});
+
 		$this->registerService('OCP\\IConfig', function($c) {
 			return $this->getServer()->getConfig();
 		});
@@ -390,5 +394,15 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		\OCP\Util::writeLog($this->getAppName(), $message, $level);
 	}
 
+	/**
+	 * Register a capability
+	 *
+	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+	 */
+	public function registerCapability($serviceName) {
+		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
+			return $this->query($serviceName);
+		});
 
+	}
 }
diff --git a/lib/private/capabilitiesmanager.php b/lib/private/capabilitiesmanager.php
index ebbd9664897..74154f2c631 100644
--- a/lib/private/capabilitiesmanager.php
+++ b/lib/private/capabilitiesmanager.php
@@ -21,10 +21,9 @@
 namespace OC;
 
 
-use OCP\Capabilities\IManager;
 use OCP\Capabilities\ICapability;
 
-class CapabilitiesManager implements IManager {
+class CapabilitiesManager {
 
 	/**
 	 * @var \Closure[]
diff --git a/lib/private/server.php b/lib/private/server.php
index 5bf3121ec0f..9503cf16ff7 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -452,12 +452,11 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('CapabilitiesManager', function (Server $c) {
 			$manager = new \OC\CapabilitiesManager();
 			$manager->registerCapability(function() use ($c) {
-				return new \OC\OCS\CoreCapabilities(
-					$c->getConfig()
-				);
+				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
 			return $manager;
 		});
+
 	}
 
 	/**
@@ -958,8 +957,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Get the manager of all the capabilities
 	 *
-	 * @return \OCP\Capabilities\IManager
-	 * @since 8.2.0
+	 * @return \OC\CapabilitiesManager
 	 */
 	public function getCapabilitiesManager() {
 		return $this->query('CapabilitiesManager');