@@ -476,7 +476,7 @@ |
||
476 | 476 | |
477 | 477 | /** |
478 | 478 | * Removes an app |
479 | - * @param string $name name of the application to remove |
|
479 | + * @param string $appId |
|
480 | 480 | * @return boolean |
481 | 481 | * |
482 | 482 | * |
@@ -524,7 +524,7 @@ |
||
524 | 524 | * @param array $input The array to work on |
525 | 525 | * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) |
526 | 526 | * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 |
527 | - * @return array |
|
527 | + * @return string |
|
528 | 528 | * @since 4.5.0 |
529 | 529 | */ |
530 | 530 | public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') { |
@@ -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 |
@@ -370,7 +370,7 @@ |
||
370 | 370 | * @param string $path path to the file which should be updated |
371 | 371 | * @param string $uid of the user who performs the operation |
372 | 372 | * @param array $accessList who has access to the file contains the key 'users' and 'public' |
373 | - * @return boolean |
|
373 | + * @return null|boolean |
|
374 | 374 | */ |
375 | 375 | public function update($path, $uid, array $accessList) { |
376 | 376 |
@@ -777,7 +777,7 @@ |
||
777 | 777 | /** |
778 | 778 | * check if path points to a files version |
779 | 779 | * |
780 | - * @param $path |
|
780 | + * @param string $path |
|
781 | 781 | * @return bool |
782 | 782 | */ |
783 | 783 | protected function isVersion($path) { |
@@ -32,7 +32,6 @@ |
||
32 | 32 | use OCA\Encryption\Crypto\Crypt; |
33 | 33 | use OCP\Encryption\Keys\IStorage; |
34 | 34 | use OCP\IConfig; |
35 | -use OCP\IDBConnection; |
|
36 | 35 | use OCP\ILogger; |
37 | 36 | use OCP\IUserSession; |
38 | 37 |
@@ -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; |
@@ -1036,7 +1036,7 @@ discard block |
||
1036 | 1036 | * @param string $principalUri |
1037 | 1037 | * @param string $uri |
1038 | 1038 | * @param array $properties |
1039 | - * @return mixed |
|
1039 | + * @return integer |
|
1040 | 1040 | */ |
1041 | 1041 | function createSubscription($principalUri, $uri, array $properties) { |
1042 | 1042 | |
@@ -1377,6 +1377,9 @@ discard block |
||
1377 | 1377 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
1378 | 1378 | } |
1379 | 1379 | |
1380 | + /** |
|
1381 | + * @param boolean $toV2 |
|
1382 | + */ |
|
1380 | 1383 | private function convertPrincipal($principalUri, $toV2) { |
1381 | 1384 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
1382 | 1385 | list(, $name) = URLUtil::splitPath($principalUri); |