@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | /** |
333 | 333 | * get the users email address |
334 | 334 | * |
335 | - * @return string|null |
|
335 | + * @return string |
|
336 | 336 | * @since 9.0.0 |
337 | 337 | */ |
338 | 338 | public function getEMailAddress() { |
@@ -417,6 +417,10 @@ discard block |
||
417 | 417 | return $url; |
418 | 418 | } |
419 | 419 | |
420 | + /** |
|
421 | + * @param string $feature |
|
422 | + * @param string $value |
|
423 | + */ |
|
420 | 424 | public function triggerChange($feature, $value = null) { |
421 | 425 | if ($this->emitter) { |
422 | 426 | $this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value)); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | * DispatcherEvent constructor. |
47 | 47 | * |
48 | 48 | * @param string $event |
49 | - * @param $appID |
|
49 | + * @param string $appID |
|
50 | 50 | * @param \OCP\IGroup[] $groups |
51 | 51 | * @since 9.0.0 |
52 | 52 | */ |
@@ -308,6 +308,7 @@ discard block |
||
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 | */ |
@@ -360,7 +361,7 @@ discard block |
||
360 | 361 | * Returns an db result and throws exceptions when there are more or less |
361 | 362 | * results |
362 | 363 | * @param string $sql the sql query |
363 | - * @param array $params the parameters of the sql query |
|
364 | + * @param string[] $params the parameters of the sql query |
|
364 | 365 | * @param int $limit the maximum number of rows |
365 | 366 | * @param int $offset from which row we want to start |
366 | 367 | * @throws DoesNotExistException if the item does not exist |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | /** |
190 | 190 | * get the current active user |
191 | 191 | * |
192 | - * @return IUser|null Current user, otherwise null |
|
192 | + * @return null|User Current user, otherwise null |
|
193 | 193 | */ |
194 | 194 | public function getUser() { |
195 | 195 | // FIXME: This is a quick'n dirty work-around for the incognito mode as |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | * |
295 | 295 | * @param string $uid |
296 | 296 | * @param string $password |
297 | - * @return boolean|null |
|
297 | + * @return boolean |
|
298 | 298 | * @throws LoginException |
299 | 299 | */ |
300 | 300 | public function login($uid, $password) { |
@@ -368,6 +368,9 @@ discard block |
||
368 | 368 | return false; |
369 | 369 | } |
370 | 370 | |
371 | + /** |
|
372 | + * @param string $uid |
|
373 | + */ |
|
371 | 374 | private function loginWithToken($uid) { |
372 | 375 | // TODO: $this->manager->emit('\OC\User', 'preTokenLogin', array($uid)); |
373 | 376 | $user = $this->manager->get($uid); |