@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace OCA\Federation\Command; |
4 | 4 | |
5 | -use OCA\Federation\DbHandler; |
|
6 | 5 | use Symfony\Component\Console\Command\Command; |
7 | 6 | use Symfony\Component\Console\Helper\ProgressBar; |
8 | 7 | use Symfony\Component\Console\Input\InputInterface; |
@@ -271,8 +271,8 @@ |
||
271 | 271 | } |
272 | 272 | |
273 | 273 | /** |
274 | - * @param $username |
|
275 | - * @param $password |
|
274 | + * @param string $username |
|
275 | + * @param string $password |
|
276 | 276 | * @return bool |
277 | 277 | */ |
278 | 278 | public function auth($username, $password) { |
@@ -3,10 +3,6 @@ |
||
3 | 3 | namespace OCA\Federation; |
4 | 4 | |
5 | 5 | use OCA\DAV\CardDAV\SyncService; |
6 | -use Symfony\Component\Console\Command\Command; |
|
7 | -use Symfony\Component\Console\Helper\ProgressBar; |
|
8 | -use Symfony\Component\Console\Input\InputInterface; |
|
9 | -use Symfony\Component\Console\Output\OutputInterface; |
|
10 | 6 | |
11 | 7 | class SyncFederationAddressBooks { |
12 | 8 |
@@ -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); |
@@ -187,7 +187,8 @@ discard block |
||
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
190 | - * @param $addressBookUri |
|
190 | + * @param string $addressBookUri |
|
191 | + * @param string $principal |
|
191 | 192 | * @return array|null |
192 | 193 | */ |
193 | 194 | public function getAddressBooksByUri($principal, $addressBookUri) { |
@@ -867,6 +868,7 @@ discard block |
||
867 | 868 | * * readOnly - boolean |
868 | 869 | * * summary - Optional, a description for the share |
869 | 870 | * |
871 | + * @param integer $addressBookId |
|
870 | 872 | * @return array |
871 | 873 | */ |
872 | 874 | public function getShares($addressBookId) { |
@@ -966,7 +968,7 @@ discard block |
||
966 | 968 | |
967 | 969 | /** |
968 | 970 | * For shared address books the sharee is set in the ACL of the address book |
969 | - * @param $addressBookId |
|
971 | + * @param integer $addressBookId |
|
970 | 972 | * @param $acl |
971 | 973 | * @return array |
972 | 974 | */ |
@@ -974,6 +976,9 @@ discard block |
||
974 | 976 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl); |
975 | 977 | } |
976 | 978 | |
979 | + /** |
|
980 | + * @param boolean $toV2 |
|
981 | + */ |
|
977 | 982 | private function convertPrincipal($principalUri, $toV2) { |
978 | 983 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
979 | 984 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -227,7 +227,7 @@ |
||
227 | 227 | } |
228 | 228 | |
229 | 229 | /** |
230 | - * @return array|null |
|
230 | + * @return string |
|
231 | 231 | */ |
232 | 232 | public function getLocalSystemAddressBook() { |
233 | 233 | if (is_null($this->localSystemAddressBook)) { |