@@ -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 |
@@ -106,7 +106,7 @@ |
||
106 | 106 | /** |
107 | 107 | * Returns an array with all the child nodes |
108 | 108 | * |
109 | - * @return \Sabre\DAV\INode[] |
|
109 | + * @return CommentNode[] |
|
110 | 110 | */ |
111 | 111 | function getChildren() { |
112 | 112 | return $this->findChildren(); |
@@ -59,6 +59,9 @@ |
||
59 | 59 | ); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param boolean $toV2 |
|
64 | + */ |
|
62 | 65 | private function convertPrincipal($principal, $toV2) { |
63 | 66 | list(, $name) = URLUtil::splitPath($principal); |
64 | 67 | 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 | */ |