@@ -449,7 +449,7 @@ |
||
449 | 449 | * @param IUser $user user to check access |
450 | 450 | * @param IGroup|null $group group to check or null |
451 | 451 | * |
452 | - * @return true if the user can manage the group |
|
452 | + * @return boolean if the user can manage the group |
|
453 | 453 | */ |
454 | 454 | private function canUserManageGroup($user, $group) { |
455 | 455 | if ($this->groupManager->isAdmin($user->getUID())) { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * |
73 | 73 | * @param Account $account |
74 | 74 | * @param AccountMapper $mapper |
75 | - * @param null $emitter |
|
75 | + * @param Manager $emitter |
|
76 | 76 | * @param IConfig|null $config |
77 | 77 | * @param null $urlGenerator |
78 | 78 | * @param EventDispatcher|null $eventDispatcher |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | /** |
98 | 98 | * get the user id |
99 | 99 | * |
100 | - * @return string |
|
100 | + * @return integer |
|
101 | 101 | */ |
102 | 102 | public function getUID() { |
103 | 103 | return $this->account->getUserId(); |
@@ -433,6 +433,10 @@ discard block |
||
433 | 433 | return $url; |
434 | 434 | } |
435 | 435 | |
436 | + /** |
|
437 | + * @param string $feature |
|
438 | + * @param string $value |
|
439 | + */ |
|
436 | 440 | public function triggerChange($feature, $value = null) { |
437 | 441 | if ($this->emitter && in_array($feature, $this->account->getUpdatedFields())) { |
438 | 442 | $this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value]); |
@@ -361,7 +361,7 @@ |
||
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @param string $version |
364 | - * @return mixed |
|
364 | + * @return \Doctrine\DBAL\Schema\Schema |
|
365 | 365 | * @throws \Exception |
366 | 366 | */ |
367 | 367 | protected function createInstance($version) { |
@@ -319,6 +319,7 @@ |
||
319 | 319 | * @param string $error_msg The error message to show |
320 | 320 | * @param string $hint An optional hint message - needs to be properly escaped |
321 | 321 | * @param int HTTP Status Code |
322 | + * @param integer $httpStatusCode |
|
322 | 323 | */ |
323 | 324 | public static function printErrorPage( $error_msg, $hint = '', $httpStatusCode = null ) { |
324 | 325 | if ($error_msg === $hint) { |
@@ -30,11 +30,9 @@ |
||
30 | 30 | use OCP\IConfig; |
31 | 31 | use Symfony\Component\Console\Command\Command; |
32 | 32 | use Symfony\Component\Console\Helper\ProgressBar; |
33 | -use Symfony\Component\Console\Helper\QuestionHelper; |
|
34 | 33 | use Symfony\Component\Console\Input\InputArgument; |
35 | 34 | use Symfony\Component\Console\Input\InputInterface; |
36 | 35 | use Symfony\Component\Console\Output\OutputInterface; |
37 | -use Symfony\Component\Console\Question\ConfirmationQuestion; |
|
38 | 36 | |
39 | 37 | class ParallelDecryptAll extends Command { |
40 | 38 |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * |
76 | 76 | * @param InputInterface $input |
77 | 77 | * @param OutputInterface $output |
78 | - * @param $user |
|
78 | + * @param string $user |
|
79 | 79 | * @return bool |
80 | 80 | */ |
81 | 81 | public function prepare(InputInterface $input, OutputInterface $output, $user) { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param string $user |
137 | 137 | * @param string $password |
138 | - * @return bool|string |
|
138 | + * @return false|string |
|
139 | 139 | * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException |
140 | 140 | */ |
141 | 141 | protected function getPrivateKey($user, $password) { |
@@ -155,6 +155,9 @@ discard block |
||
155 | 155 | return $privateKey; |
156 | 156 | } |
157 | 157 | |
158 | + /** |
|
159 | + * @param string $privateKey |
|
160 | + */ |
|
158 | 161 | protected function updateSession($user, $privateKey) { |
159 | 162 | $this->session->prepareDecryptAll($user, $privateKey); |
160 | 163 | } |