From 0be292196657bb6d525214d7f6832029bde189cd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Feb 2017 12:47:46 +0100 Subject: Fix DI of the cloud id manager into apps Signed-off-by: Joas Schilling --- lib/private/AppFramework/DependencyInjection/DIContainer.php | 5 +++++ lib/private/Federation/CloudIdManager.php | 1 + 2 files changed, 6 insertions(+) (limited to 'lib/private') diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 5a350bbec5a..ec36aab75d9 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -49,6 +49,7 @@ use OC\RichObjectStrings\Validator; use OC\Security\Bruteforce\Throttler; use OCP\AppFramework\IApi; use OCP\AppFramework\IAppContainer; +use OCP\Federation\ICloudIdManager; use OCP\Files\IAppData; use OCP\Files\Mount\IMountManager; use OCP\RichObjectStrings\IValidator; @@ -152,6 +153,10 @@ class DIContainer extends SimpleContainer implements IAppContainer { return $this->getServer()->getQueryLogger(); }); + $this->registerService(ICloudIdManager::class, function($c) { + return $this->getServer()->getCloudIdManager(); + }); + $this->registerService('OCP\\Files\\IMimeTypeDetector', function($c) { return $this->getServer()->getMimeTypeDetector(); }); diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php index 45cc69b306e..46d90f7ab92 100644 --- a/lib/private/Federation/CloudIdManager.php +++ b/lib/private/Federation/CloudIdManager.php @@ -27,6 +27,7 @@ class CloudIdManager implements ICloudIdManager { /** * @param string $cloudId * @return ICloudId + * @throws \InvalidArgumentException */ public function resolveCloudId($cloudId) { // TODO magic here to get the url and user instead of just splitting on @ -- cgit v1.2.3