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, 7 insertions, 51 deletions

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();
 }