@@ -323,7 +323,7 @@  | 
                                                    ||
| 323 | 323 | /**  | 
                                                        
| 324 | 324 | * find all available languages for an app  | 
                                                        
| 325 | 325 | * @param string $app App that needs to be translated  | 
                                                        
| 326 | - * @return array an array of available languages  | 
                                                        |
| 326 | + * @return string[] an array of available languages  | 
                                                        |
| 327 | 327 | * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->findAvailableLanguages() instead  | 
                                                        
| 328 | 328 | */  | 
                                                        
| 329 | 329 |  	public static function findAvailableLanguages($app=null) { | 
                                                        
@@ -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 | |
@@ -289,6 +289,9 @@ discard block  | 
                                                    ||
| 289 | 289 | return $calendar;  | 
                                                        
| 290 | 290 | }  | 
                                                        
| 291 | 291 | |
| 292 | + /**  | 
                                                        |
| 293 | + * @param integer $calendarId  | 
                                                        |
| 294 | + */  | 
                                                        |
| 292 | 295 |  	public function getCalendarById($calendarId) { | 
                                                        
| 293 | 296 | $fields = array_values($this->propertyMap);  | 
                                                        
| 294 | 297 | $fields[] = 'id';  | 
                                                        
@@ -597,7 +600,7 @@ discard block  | 
                                                    ||
| 597 | 600 | * calendar-data. If the result of a subsequent GET to this object is not  | 
                                                        
| 598 | 601 | * the exact same as this request body, you should omit the ETag.  | 
                                                        
| 599 | 602 | *  | 
                                                        
| 600 | - * @param mixed $calendarId  | 
                                                        |
| 603 | + * @param integer $calendarId  | 
                                                        |
| 601 | 604 | * @param string $objectUri  | 
                                                        
| 602 | 605 | * @param string $calendarData  | 
                                                        
| 603 | 606 | * @return string  | 
                                                        
@@ -1036,7 +1039,7 @@ discard block  | 
                                                    ||
| 1036 | 1039 | * @param string $principalUri  | 
                                                        
| 1037 | 1040 | * @param string $uri  | 
                                                        
| 1038 | 1041 | * @param array $properties  | 
                                                        
| 1039 | - * @return mixed  | 
                                                        |
| 1042 | + * @return integer  | 
                                                        |
| 1040 | 1043 | */  | 
                                                        
| 1041 | 1044 |  	function createSubscription($principalUri, $uri, array $properties) { | 
                                                        
| 1042 | 1045 | |
@@ -1377,6 +1380,9 @@ discard block  | 
                                                    ||
| 1377 | 1380 | return $this->sharingBackend->applyShareAcl($resourceId, $acl);  | 
                                                        
| 1378 | 1381 | }  | 
                                                        
| 1379 | 1382 | |
| 1383 | + /**  | 
                                                        |
| 1384 | + * @param boolean $toV2  | 
                                                        |
| 1385 | + */  | 
                                                        |
| 1380 | 1386 |  	private function convertPrincipal($principalUri, $toV2) { | 
                                                        
| 1381 | 1387 |  		if ($this->principalBackend->getPrincipalPrefix() === 'principals') { | 
                                                        
| 1382 | 1388 | list(, $name) = URLUtil::splitPath($principalUri);  | 
                                                        
@@ -22,7 +22,6 @@  | 
                                                    ||
| 22 | 22 | namespace OCA\DAV\CalDAV;  | 
                                                        
| 23 | 23 | |
| 24 | 24 | use OCA\DAV\DAV\Sharing\IShareable;  | 
                                                        
| 25 | -use Sabre\CalDAV\Backend\BackendInterface;  | 
                                                        |
| 26 | 25 | use Sabre\DAV\Exception\Forbidden;  | 
                                                        
| 27 | 26 | use Sabre\DAV\PropPatch;  | 
                                                        
| 28 | 27 | |
@@ -867,6 +867,7 @@ discard block  | 
                                                    ||
| 867 | 867 | * * readOnly - boolean  | 
                                                        
| 868 | 868 | * * summary - Optional, a description for the share  | 
                                                        
| 869 | 869 | *  | 
                                                        
| 870 | + * @param integer $addressBookId  | 
                                                        |
| 870 | 871 | * @return array  | 
                                                        
| 871 | 872 | */  | 
                                                        
| 872 | 873 |  	public function getShares($addressBookId) { | 
                                                        
@@ -966,7 +967,7 @@ discard block  | 
                                                    ||
| 966 | 967 | |
| 967 | 968 | /**  | 
                                                        
| 968 | 969 | * For shared address books the sharee is set in the ACL of the address book  | 
                                                        
| 969 | - * @param $addressBookId  | 
                                                        |
| 970 | + * @param integer $addressBookId  | 
                                                        |
| 970 | 971 | * @param $acl  | 
                                                        
| 971 | 972 | * @return array  | 
                                                        
| 972 | 973 | */  | 
                                                        
@@ -974,6 +975,9 @@ discard block  | 
                                                    ||
| 974 | 975 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl);  | 
                                                        
| 975 | 976 | }  | 
                                                        
| 976 | 977 | |
| 978 | + /**  | 
                                                        |
| 979 | + * @param boolean $toV2  | 
                                                        |
| 980 | + */  | 
                                                        |
| 977 | 981 |  	private function convertPrincipal($principalUri, $toV2) { | 
                                                        
| 978 | 982 |  		if ($this->principalBackend->getPrincipalPrefix() === 'principals') { | 
                                                        
| 979 | 983 | list(, $name) = URLUtil::splitPath($principalUri);  | 
                                                        
@@ -246,7 +246,7 @@  | 
                                                    ||
| 246 | 246 | }  | 
                                                        
| 247 | 247 | |
| 248 | 248 | /**  | 
                                                        
| 249 | - * @return array|null  | 
                                                        |
| 249 | + * @return string  | 
                                                        |
| 250 | 250 | */  | 
                                                        
| 251 | 251 |  	public function getLocalSystemAddressBook() { | 
                                                        
| 252 | 252 |  		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 | /**  | 
                                                        
@@ -176,7 +176,7 @@  | 
                                                    ||
| 176 | 176 | * Returns an associative array with all translations  | 
                                                        
| 177 | 177 | *  | 
                                                        
| 178 | 178 | * Called by \OC_L10N_String  | 
                                                        
| 179 | - * @return array  | 
                                                        |
| 179 | + * @return string[]  | 
                                                        |
| 180 | 180 | */  | 
                                                        
| 181 | 181 |  	public function getTranslations() { | 
                                                        
| 182 | 182 | return $this->translations;  |