diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-22 13:04:56 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-08-10 10:45:16 +0200 |
| commit | f0b617b50825566ec1b417eed09688e88de5f0bb (patch) | |
| tree | d7d009ba3d197dd78ff16e83543bba991dbe250f /lib/private/server.php | |
| parent | c80c9819dcc1a4c79b5c2621a3ec07623e1cd140 (diff) | |
| download | nextcloud-server-f0b617b50825566ec1b417eed09688e88de5f0bb.tar.gz nextcloud-server-f0b617b50825566ec1b417eed09688e88de5f0bb.zip | |
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
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 8 |
1 files changed, 3 insertions, 5 deletions
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'); |