@@ -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)) { |
@@ -21,7 +21,6 @@ |
||
| 21 | 21 | namespace OCA\DAV\Connector\Sabre; |
| 22 | 22 | |
| 23 | 23 | use Sabre\Xml\XmlSerializable; |
| 24 | -use Sabre\Xml\Element; |
|
| 25 | 24 | use Sabre\Xml\Writer; |
| 26 | 25 | |
| 27 | 26 | /** |
@@ -22,11 +22,6 @@ |
||
| 22 | 22 | namespace OCA\DAV\Command; |
| 23 | 23 | |
| 24 | 24 | use OCA\DAV\CardDAV\CardDavBackend; |
| 25 | -use OCA\DAV\Connector\Sabre\Principal; |
|
| 26 | -use OCP\IConfig; |
|
| 27 | -use OCP\IDBConnection; |
|
| 28 | -use OCP\IGroupManager; |
|
| 29 | -use OCP\ILogger; |
|
| 30 | 25 | use OCP\IUserManager; |
| 31 | 26 | use Symfony\Component\Console\Command\Command; |
| 32 | 27 | use Symfony\Component\Console\Input\InputArgument; |
@@ -21,10 +21,8 @@ |
||
| 21 | 21 | namespace OCA\DAV\Command; |
| 22 | 22 | |
| 23 | 23 | use OCA\DAV\CardDAV\SyncService; |
| 24 | -use OCP\IUserManager; |
|
| 25 | 24 | use Symfony\Component\Console\Command\Command; |
| 26 | 25 | use Symfony\Component\Console\Helper\ProgressBar; |
| 27 | -use Symfony\Component\Console\Input\InputArgument; |
|
| 28 | 26 | use Symfony\Component\Console\Input\InputInterface; |
| 29 | 27 | use Symfony\Component\Console\Output\OutputInterface; |
| 30 | 28 | |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * Returns the list of members for a group-principal |
| 137 | 137 | * |
| 138 | 138 | * @param string $principal |
| 139 | - * @return array |
|
| 139 | + * @return string[] |
|
| 140 | 140 | */ |
| 141 | 141 | function getGroupMemberSet($principal) { |
| 142 | 142 | // TODO: for now the group principal has only one member, the user itself |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * Returns the list of members for a group-principal |
| 137 | 137 | * |
| 138 | 138 | * @param string $principal |
| 139 | - * @return array |
|
| 139 | + * @return string[] |
|
| 140 | 140 | */ |
| 141 | 141 | function getGroupMemberSet($principal) { |
| 142 | 142 | // TODO: for now the group principal has only one member, the user itself |