@@ -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 | */ |
@@ -23,14 +23,11 @@ |
||
23 | 23 | namespace OCA\DAV\Connector\Sabre; |
24 | 24 | |
25 | 25 | use Sabre\DAV\Exception\NotFound; |
26 | -use Sabre\DAV\IFile; |
|
27 | 26 | use Sabre\DAV\INode; |
28 | 27 | use \Sabre\DAV\PropFind; |
29 | 28 | use \Sabre\DAV\PropPatch; |
30 | -use Sabre\DAVACL\Exception\NeedPrivileges; |
|
31 | 29 | use \Sabre\HTTP\RequestInterface; |
32 | 30 | use \Sabre\HTTP\ResponseInterface; |
33 | -use Sabre\HTTP\URLUtil; |
|
34 | 31 | |
35 | 32 | /** |
36 | 33 | * Class DavAclPlugin is a wrapper around \Sabre\DAVACL\Plugin that returns 404 |
@@ -24,7 +24,6 @@ |
||
24 | 24 | use OCA\DAV\Connector\Sabre\Auth; |
25 | 25 | use OCA\DAV\DAV\Sharing\Xml\Invite; |
26 | 26 | use OCP\IRequest; |
27 | -use Sabre\DAV\Exception\BadRequest; |
|
28 | 27 | use Sabre\DAV\Exception\NotFound; |
29 | 28 | use Sabre\DAV\INode; |
30 | 29 | use Sabre\DAV\PropFind; |