diff options
author | Joas Schilling <coding@schilljs.com> | 2016-10-06 16:57:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-06 16:57:39 +0200 |
commit | a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e (patch) | |
tree | 335f901a7493d920ad6a382647fdbcb5193af7ce /settings/Controller/EncryptionController.php | |
parent | 6d688e89c1457a682fcc07e595e96014ada36add (diff) | |
parent | ed30b1f64537e94fb9874cd5f52be03c5e66899b (diff) | |
download | nextcloud-server-a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e.tar.gz nextcloud-server-a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e.zip |
Merge pull request #1629 from nextcloud/cleanup-settings-application
Cleanup settings Application class
Diffstat (limited to 'settings/Controller/EncryptionController.php')
-rw-r--r-- | settings/Controller/EncryptionController.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php index b2757b0965f..cda50853fdc 100644 --- a/settings/Controller/EncryptionController.php +++ b/settings/Controller/EncryptionController.php @@ -23,14 +23,15 @@ namespace OC\Settings\Controller; + use OC\Files\View; use OCA\Encryption\Migration; +use OCP\IDBConnection; use OCP\IL10N; use OCP\AppFramework\Controller; use OCP\ILogger; use OCP\IRequest; use OCP\IConfig; -use OC\DB\Connection; use OCP\IUserManager; /** @@ -38,10 +39,10 @@ use OCP\IUserManager; */ class EncryptionController extends Controller { - /** @var \OCP\IL10N */ + /** @var IL10N */ private $l10n; - /** @var Connection */ + /** @var IDBConnection */ private $connection; /** @var IConfig */ @@ -53,15 +54,15 @@ class EncryptionController extends Controller { /** @var View */ private $view; - /** @var ILogger */ + /** @var ILogger */ private $logger; /** * @param string $appName * @param IRequest $request - * @param \OCP\IL10N $l10n - * @param \OCP\IConfig $config - * @param \OC\DB\Connection $connection + * @param IL10N $l10n + * @param IConfig $config + * @param IDBConnection $connection * @param IUserManager $userManager * @param View $view * @param ILogger $logger @@ -70,7 +71,7 @@ class EncryptionController extends Controller { IRequest $request, IL10N $l10n, IConfig $config, - Connection $connection, + IDBConnection $connection, IUserManager $userManager, View $view, ILogger $logger) { @@ -86,13 +87,13 @@ class EncryptionController extends Controller { /** * @param IConfig $config * @param View $view - * @param Connection $connection + * @param IDBConnection $connection * @param ILogger $logger * @return Migration */ protected function getMigration(IConfig $config, View $view, - Connection $connection, + IDBConnection $connection, ILogger $logger) { return new Migration($config, $view, $connection, $logger); } |