@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * |
72 | 72 | * @param Account $account |
73 | 73 | * @param AccountMapper $mapper |
74 | - * @param null $emitter |
|
74 | + * @param Manager $emitter |
|
75 | 75 | * @param IConfig|null $config |
76 | 76 | * @param null $urlGenerator |
77 | 77 | * @param EventDispatcher|null $eventDispatcher |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | /** |
97 | 97 | * get the user id |
98 | 98 | * |
99 | - * @return string |
|
99 | + * @return integer |
|
100 | 100 | */ |
101 | 101 | public function getUID() { |
102 | 102 | return $this->account->getUserId(); |
@@ -413,6 +413,10 @@ discard block |
||
413 | 413 | return $url; |
414 | 414 | } |
415 | 415 | |
416 | + /** |
|
417 | + * @param string $feature |
|
418 | + * @param string $value |
|
419 | + */ |
|
416 | 420 | public function triggerChange($feature, $value = null) { |
417 | 421 | if ($this->emitter) { |
418 | 422 | $this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value]); |
@@ -308,6 +308,7 @@ |
||
308 | 308 | * @param array $params the parameters of the sql query |
309 | 309 | * @param int $limit the maximum number of rows |
310 | 310 | * @param int $offset from which row we want to start |
311 | + * @param string $msg |
|
311 | 312 | * @return string formatted error message string |
312 | 313 | * @since 9.1.0 |
313 | 314 | */ |
@@ -329,7 +329,7 @@ |
||
329 | 329 | /** |
330 | 330 | * Checks if the version requires an update and shows |
331 | 331 | * @param bool $showTemplate Whether an update screen should get shown |
332 | - * @return bool |
|
332 | + * @return null|boolean |
|
333 | 333 | */ |
334 | 334 | public static function checkUpgrade($showTemplate = true) { |
335 | 335 | if (\OCP\Util::needUpgrade()) { |
@@ -24,7 +24,6 @@ |
||
24 | 24 | |
25 | 25 | |
26 | 26 | use OCP\AppFramework\Db\Entity; |
27 | -use OCP\AppFramework\QueryException; |
|
28 | 27 | use OCP\UserInterface; |
29 | 28 | |
30 | 29 | /** |
@@ -1,11 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace OC\Migrations; |
3 | 3 | |
4 | -use OC\User\Account; |
|
5 | 4 | use OC\User\AccountMapper; |
6 | 5 | use OC\User\Database; |
7 | 6 | use OC\User\SyncService; |
8 | -use OCP\IConfig; |
|
9 | 7 | use OCP\Migration\ISimpleMigration; |
10 | 8 | use OCP\Migration\IOutput; |
11 | 9 |
@@ -308,7 +308,7 @@ |
||
308 | 308 | /** |
309 | 309 | * counts the users in the database |
310 | 310 | * |
311 | - * @return int|bool |
|
311 | + * @return integer |
|
312 | 312 | */ |
313 | 313 | public function countUsers() { |
314 | 314 | $query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); |
@@ -23,7 +23,6 @@ |
||
23 | 23 | namespace OC\User; |
24 | 24 | |
25 | 25 | |
26 | -use OCP\IImage; |
|
27 | 26 | use OCP\IUser; |
28 | 27 | |
29 | 28 | /** |
@@ -148,6 +148,9 @@ |
||
148 | 148 | return $a; |
149 | 149 | } |
150 | 150 | |
151 | + /** |
|
152 | + * @param string $uid |
|
153 | + */ |
|
151 | 154 | private function createNewAccount($uid) { |
152 | 155 | $a = new Account(); |
153 | 156 | $a->setUserId($uid); |
@@ -381,6 +381,9 @@ |
||
381 | 381 | return $account; |
382 | 382 | } |
383 | 383 | |
384 | + /** |
|
385 | + * @param string $backendClass |
|
386 | + */ |
|
384 | 387 | public function getBackend($backendClass) { |
385 | 388 | if (isset($this->backends[$backendClass])) { |
386 | 389 | return $this->backends[$backendClass]; |