Switch to a factory and add unit tests

1 files changed, 4 insertions, 3 deletions

diff --git a/settings/application.php b/settings/application.php
index 3b2c77ab849..6fe23447a72 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -16,6 +16,7 @@ use OC\Settings\Controller\LogSettingsController;
 use OC\Settings\Controller\MailSettingsController;
 use OC\Settings\Controller\SecuritySettingsController;
 use OC\Settings\Controller\UsersController;
+use OC\Settings\Factory\SubAdminFactory;
 use OC\Settings\Middleware\SubadminMiddleware;
 use \OCP\AppFramework\App;
 use OCP\IContainer;
@@ -92,7 +93,7 @@ class Application extends App {
 				$c->query('DefaultMailAddress'),
 				$c->query('URLGenerator'),
 				$c->query('OCP\\App\\IAppManager'),
-				$c->query('SubAdminOfGroups')
+				$c->query('SubAdminFactory')
 			);
 		});
 		$container->registerService('LogSettingsController', function(IContainer $c) {
@@ -147,8 +148,8 @@ class Application extends App {
 			return \OC_Subadmin::isSubAdmin(\OC_User::getUser());
 		});
 		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$container->registerService('SubAdminOfGroups', function(IContainer $c) {
-			return \OC_SubAdmin::getSubAdminsGroups(\OC_User::getUser());
+		$container->registerService('SubAdminFactory', function(IContainer $c) {
+			return new SubAdminFactory();
 		});
 		$container->registerService('Mail', function(IContainer $c) {
 			return new \OC_Mail;