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

6 files changed, 25 insertions, 58 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');
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
index 64b1082aa97..7338dbd858d 100644
--- a/lib/public/appframework/iappcontainer.php
+++ b/lib/public/appframework/iappcontainer.php
@@ -86,4 +86,11 @@ interface IAppContainer extends IContainer {
 	 */
 	function log($message, $level);
 
+	/**
+	 * Register a capability
+	 *
+	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+	 * @since 8.2.0
+	 */
+	 public function registerCapability($serviceName);
 }
diff --git a/lib/public/capabilities/imanager.php b/lib/public/capabilities/imanager.php
deleted file mode 100644
index df563bd2b25..00000000000
--- a/lib/public/capabilities/imanager.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-namespace OCP\Capabilities;
-
-
-interface IManager {
-
-	/**
-	 * Get an array of al the capabilities that are registered at this manager
-	 *
-	 * @return array All the capabilities registered in this manager
-	 * @since 8.2.0
-	 */
-	public function getCapabilities();
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of OCP\Capabilities\ICapability
-	 *
-	 * @param \Closure $callable
-	 * @since 8.2.0
-	 */
-	public function registerCapability(\Closure $callable);
-}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 6cb8d668658..ab1729da255 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -439,11 +439,4 @@ interface IServerContainer {
 	 */
 	public function getMimeTypeDetector();
 
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return \OCP\Capabilities\IManager
-	 * @since 8.2.0
-	 */
-	public function getCapabilitiesManager();
 }