Skip to content
Snippets Groups Projects
Unverified Commit ae8ea577 authored by John Molakvoæ's avatar John Molakvoæ
Browse files

Bump tests and editorconfig

parent 62e1014b
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,6 @@ end_of_line = lf ...@@ -7,6 +7,6 @@ end_of_line = lf
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[{package.json,.travis.yml}] [{package.json,.travis.yml,webpack.config.js}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
\ No newline at end of file
...@@ -48,6 +48,7 @@ use OCP\AppFramework\Controller; ...@@ -48,6 +48,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\IJobList;
use OCP\Encryption\IManager;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
...@@ -88,6 +89,8 @@ class UsersController extends Controller { ...@@ -88,6 +89,8 @@ class UsersController extends Controller {
private $keyManager; private $keyManager;
/** @var IJobList */ /** @var IJobList */
private $jobList; private $jobList;
/** @var IManager */
private $encryptionManager;
public function __construct(string $appName, public function __construct(string $appName,
...@@ -103,7 +106,8 @@ class UsersController extends Controller { ...@@ -103,7 +106,8 @@ class UsersController extends Controller {
IAppManager $appManager, IAppManager $appManager,
AccountManager $accountManager, AccountManager $accountManager,
Manager $keyManager, Manager $keyManager,
IJobList $jobList) { IJobList $jobList,
IManager $encryptionManager) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userManager = $userManager; $this->userManager = $userManager;
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
...@@ -117,6 +121,7 @@ class UsersController extends Controller { ...@@ -117,6 +121,7 @@ class UsersController extends Controller {
$this->accountManager = $accountManager; $this->accountManager = $accountManager;
$this->keyManager = $keyManager; $this->keyManager = $keyManager;
$this->jobList = $jobList; $this->jobList = $jobList;
$this->encryptionManager = $encryptionManager;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment