@@ -25,7 +25,6 @@ |
||
25 | 25 | use OCA\DAV\CalDAV\CalDavBackend; |
26 | 26 | use OCA\DAV\CardDAV\CardDavBackend; |
27 | 27 | use OCA\DAV\CardDAV\ContactsManager; |
28 | -use OCA\DAV\CardDAV\SyncJob; |
|
29 | 28 | use OCA\DAV\CardDAV\SyncService; |
30 | 29 | use OCA\DAV\Connector\Sabre\Principal; |
31 | 30 | use OCA\DAV\DAV\GroupPrincipalBackend; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | /** |
140 | 140 | * get the current active user |
141 | 141 | * |
142 | - * @return \OCP\IUser|null Current user, otherwise null |
|
142 | + * @return null|User Current user, otherwise null |
|
143 | 143 | */ |
144 | 144 | public function getUser() { |
145 | 145 | // FIXME: This is a quick'n dirty work-around for the incognito mode as |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | * |
212 | 212 | * @param string $uid |
213 | 213 | * @param string $password |
214 | - * @return boolean|null |
|
214 | + * @return boolean |
|
215 | 215 | * @throws LoginException |
216 | 216 | */ |
217 | 217 | public function login($uid, $password) { |
@@ -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 |
@@ -670,7 +670,7 @@ discard block |
||
670 | 670 | * if the size limit for the trash bin is reached, we delete the oldest |
671 | 671 | * files in the trash bin until we meet the limit again |
672 | 672 | * |
673 | - * @param array $files |
|
673 | + * @param \OCP\Files\FileInfo[] $files |
|
674 | 674 | * @param string $user |
675 | 675 | * @param int $availableSpace available disc space |
676 | 676 | * @return int size of deleted files |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | /** |
699 | 699 | * delete files older then max storage time |
700 | 700 | * |
701 | - * @param array $files list of files sorted by mtime |
|
701 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
702 | 702 | * @param string $user |
703 | 703 | * @return integer[] size of deleted files and number of deleted files |
704 | 704 | */ |
@@ -768,6 +768,7 @@ discard block |
||
768 | 768 | * |
769 | 769 | * @param string $filename name of the file which should be restored |
770 | 770 | * @param int $timestamp timestamp when the file was deleted |
771 | + * @param string|boolean $user |
|
771 | 772 | * @return array |
772 | 773 | */ |
773 | 774 | private static function getVersionsFromTrash($filename, $timestamp, $user) { |
@@ -420,6 +420,9 @@ |
||
420 | 420 | return \OC_User::isAdminUser($uid); |
421 | 421 | } |
422 | 422 | |
423 | + /** |
|
424 | + * @return string |
|
425 | + */ |
|
423 | 426 | private function getUserId() { |
424 | 427 | return $this->getServer()->getSession()->get('user_id'); |
425 | 428 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | * and does not take the chroot into account ) |
197 | 197 | * |
198 | 198 | * @param string $path |
199 | - * @return \OCP\Files\Mount\IMountPoint |
|
199 | + * @return Mount\MountPoint|null |
|
200 | 200 | */ |
201 | 201 | public function getMount($path) { |
202 | 202 | return Filesystem::getMountManager()->find($this->getAbsolutePath($path)); |
@@ -2034,7 +2034,7 @@ discard block |
||
2034 | 2034 | |
2035 | 2035 | /** |
2036 | 2036 | * @param string $filename |
2037 | - * @return array |
|
2037 | + * @return string[] |
|
2038 | 2038 | * @throws \OC\User\NoUserException |
2039 | 2039 | * @throws NotFoundException |
2040 | 2040 | */ |
@@ -278,6 +278,10 @@ |
||
278 | 278 | */ |
279 | 279 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
280 | 280 | // FIXME This is also the reason, why it is not in the public interface |
281 | + |
|
282 | + /** |
|
283 | + * @param string|boolean $app |
|
284 | + */ |
|
281 | 285 | public function getL10nFilesForApp($app, $lang) { |
282 | 286 | $languageFiles = []; |
283 | 287 |