@@ -1037,7 +1037,7 @@ discard block  | 
                                                    ||
| 1037 | 1037 | * @param string $principalUri  | 
                                                        
| 1038 | 1038 | * @param string $uri  | 
                                                        
| 1039 | 1039 | * @param array $properties  | 
                                                        
| 1040 | - * @return mixed  | 
                                                        |
| 1040 | + * @return integer  | 
                                                        |
| 1041 | 1041 | */  | 
                                                        
| 1042 | 1042 |  	function createSubscription($principalUri, $uri, array $properties) { | 
                                                        
| 1043 | 1043 | |
@@ -1378,6 +1378,9 @@ discard block  | 
                                                    ||
| 1378 | 1378 | return $this->sharingBackend->applyShareAcl($resourceId, $acl);  | 
                                                        
| 1379 | 1379 | }  | 
                                                        
| 1380 | 1380 | |
| 1381 | + /**  | 
                                                        |
| 1382 | + * @param boolean $toV2  | 
                                                        |
| 1383 | + */  | 
                                                        |
| 1381 | 1384 |  	private function convertPrincipal($principalUri, $toV2) { | 
                                                        
| 1382 | 1385 |  		if ($this->principalBackend->getPrincipalPrefix() === 'principals') { | 
                                                        
| 1383 | 1386 | list(, $name) = URLUtil::splitPath($principalUri);  | 
                                                        
@@ -188,7 +188,8 @@ discard block  | 
                                                    ||
| 188 | 188 | }  | 
                                                        
| 189 | 189 | |
| 190 | 190 | /**  | 
                                                        
| 191 | - * @param $addressBookUri  | 
                                                        |
| 191 | + * @param string $addressBookUri  | 
                                                        |
| 192 | + * @param string $principal  | 
                                                        |
| 192 | 193 | * @return array|null  | 
                                                        
| 193 | 194 | */  | 
                                                        
| 194 | 195 |  	public function getAddressBooksByUri($principal, $addressBookUri) { | 
                                                        
@@ -868,6 +869,7 @@ discard block  | 
                                                    ||
| 868 | 869 | * * readOnly - boolean  | 
                                                        
| 869 | 870 | * * summary - Optional, a description for the share  | 
                                                        
| 870 | 871 | *  | 
                                                        
| 872 | + * @param integer $addressBookId  | 
                                                        |
| 871 | 873 | * @return array  | 
                                                        
| 872 | 874 | */  | 
                                                        
| 873 | 875 |  	public function getShares($addressBookId) { | 
                                                        
@@ -967,7 +969,7 @@ discard block  | 
                                                    ||
| 967 | 969 | |
| 968 | 970 | /**  | 
                                                        
| 969 | 971 | * For shared address books the sharee is set in the ACL of the address book  | 
                                                        
| 970 | - * @param $addressBookId  | 
                                                        |
| 972 | + * @param integer $addressBookId  | 
                                                        |
| 971 | 973 | * @param $acl  | 
                                                        
| 972 | 974 | * @return array  | 
                                                        
| 973 | 975 | */  | 
                                                        
@@ -975,6 +977,9 @@ discard block  | 
                                                    ||
| 975 | 977 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl);  | 
                                                        
| 976 | 978 | }  | 
                                                        
| 977 | 979 | |
| 980 | + /**  | 
                                                        |
| 981 | + * @param boolean $toV2  | 
                                                        |
| 982 | + */  | 
                                                        |
| 978 | 983 |  	private function convertPrincipal($principalUri, $toV2) { | 
                                                        
| 979 | 984 |  		if ($this->principalBackend->getPrincipalPrefix() === 'principals') { | 
                                                        
| 980 | 985 | 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)) { | 
                                                        
@@ -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 | |
@@ -115,7 +115,7 @@  | 
                                                    ||
| 115 | 115 | /**  | 
                                                        
| 116 | 116 | * Returns an array with all the child nodes  | 
                                                        
| 117 | 117 | *  | 
                                                        
| 118 | - * @return \Sabre\DAV\INode[]  | 
                                                        |
| 118 | + * @return CommentNode[]  | 
                                                        |
| 119 | 119 | */  | 
                                                        
| 120 | 120 |  	function getChildren() { | 
                                                        
| 121 | 121 | return $this->findChildren();  | 
                                                        
@@ -64,6 +64,9 @@  | 
                                                    ||
| 64 | 64 | );  | 
                                                        
| 65 | 65 | }  | 
                                                        
| 66 | 66 | |
| 67 | + /**  | 
                                                        |
| 68 | + * @param boolean $toV2  | 
                                                        |
| 69 | + */  | 
                                                        |
| 67 | 70 |  	private function convertPrincipal($principal, $toV2) { | 
                                                        
| 68 | 71 | list(, $name) = URLUtil::splitPath($principal);  | 
                                                        
| 69 | 72 |  		if ($toV2) { | 
                                                        
@@ -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 | /**  | 
                                                        
@@ -75,7 +75,7 @@  | 
                                                    ||
| 75 | 75 | private $cache = [];  | 
                                                        
| 76 | 76 | |
| 77 | 77 | /**  | 
                                                        
| 78 | - * @param Tree $tree node tree  | 
                                                        |
| 78 | + * @param ObjectTree $tree node tree  | 
                                                        |
| 79 | 79 | * @param IDBConnection $connection database connection  | 
                                                        
| 80 | 80 | * @param IUser $user owner of the tree and properties  | 
                                                        
| 81 | 81 | */  |