6 files changed, 17 insertions, 8 deletions

diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php
index da292826f0a..bb320336d48 100644
--- a/apps/files_sharing/tests/UpdaterTest.php
+++ b/apps/files_sharing/tests/UpdaterTest.php
@@ -71,7 +71,8 @@ class UpdaterTest extends TestCase {
 	 */
 	function testDeleteParentFolder() {
 		$status = \OC_App::isEnabled('files_trashbin');
-		\OC_App::enable('files_trashbin');
+		(new \OC_App())->enable('files_trashbin');
+
 
 		\OCA\Files_Trashbin\Trashbin::registerHooks();
 
diff --git a/core/Command/App/Enable.php b/core/Command/App/Enable.php
index 19f24d82e43..4aa38cd6f8f 100644
--- a/core/Command/App/Enable.php
+++ b/core/Command/App/Enable.php
@@ -75,11 +75,12 @@ class Enable extends Command implements CompletionAwareInterface {
 		}
 
 		$groups = $input->getOption('groups');
+		$appClass = new \OC_App();
 		if (empty($groups)) {
-			\OC_App::enable($appId);
+			$appClass->enable($appId);
 			$output->writeln($appId . ' enabled');
 		} else {
-			\OC_App::enable($appId, $groups);
+			$appClass->enable($appId, $groups);
 			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
 		}
 		return 0;
diff --git a/tests/Settings/Controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php
index fc9d04fcfe7..72fcf1bd7fc 100644
--- a/tests/Settings/Controller/AppSettingsControllerTest.php
+++ b/tests/Settings/Controller/AppSettingsControllerTest.php
@@ -29,6 +29,7 @@ use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\ICacheFactory;
+use OCP\L10N\IFactory;
 use Test\TestCase;
 use OCP\IRequest;
 use OCP\IL10N;
@@ -61,6 +62,8 @@ class AppSettingsControllerTest extends TestCase {
 	private $categoryFetcher;
 	/** @var AppFetcher|\PHPUnit_Framework_MockObject_MockObject */
 	private $appFetcher;
+	/** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */
+	private $l10nFactory;
 
 	public function setUp() {
 		parent::setUp();
@@ -82,6 +85,7 @@ class AppSettingsControllerTest extends TestCase {
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->categoryFetcher = $this->createMock(CategoryFetcher::class);
 		$this->appFetcher = $this->createMock(AppFetcher::class);
+		$this->l10nFactory = $this->createMock(IFactory::class);
 
 		$this->appSettingsController = new AppSettingsController(
 			'settings',
@@ -92,7 +96,8 @@ class AppSettingsControllerTest extends TestCase {
 			$this->navigationManager,
 			$this->appManager,
 			$this->categoryFetcher,
-			$this->appFetcher
+			$this->appFetcher,
+			$this->l10nFactory
 		);
 	}
 
diff --git a/tests/enable_all.php b/tests/enable_all.php
index afea5c89665..655597be7c8 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -10,7 +10,7 @@ require_once __DIR__.'/../lib/base.php';
 
 function enableApp($app) {
 	try {
-		OC_App::enable($app);
+		(new \OC_App())->enable($app);
 	} catch (Exception $e) {
 		echo $e;
 	}
diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
index e1c17b841a2..11c0e2675b1 100644
--- a/tests/lib/InstallerTest.php
+++ b/tests/lib/InstallerTest.php
@@ -49,7 +49,8 @@ class InstallerTest extends TestCase {
 			]
 		);
 
-		Installer::installApp($data);
+		$installer = new Installer();
+		$installer->installApp($data);
 		$isInstalled = Installer::isInstalled(self::$appid);
 
 		$this->assertTrue($isInstalled);
@@ -88,7 +89,8 @@ class InstallerTest extends TestCase {
 			]
 		);
 
-		Installer::installApp($oldData);
+		$installer = new Installer();
+		$installer->installApp($oldData);
 		$oldVersionNumber = \OC_App::getAppVersion(self::$appid);
 
 		Installer::updateApp($newData);
diff --git a/tests/lib/StreamWrappersTest.php b/tests/lib/StreamWrappersTest.php
index c0ecb5e738b..eb35fd54454 100644
--- a/tests/lib/StreamWrappersTest.php
+++ b/tests/lib/StreamWrappersTest.php
@@ -38,7 +38,7 @@ class StreamWrappersTest extends \Test\TestCase {
 
 	public static function tearDownAfterClass() {
 		if (self::$trashBinStatus) {
-			\OC_App::enable('files_trashbin');
+			(new \OC_App())->enable('files_trashbin');
 		}
 	}