@@ -20,7 +20,6 @@ |
||
20 | 20 | */ |
21 | 21 | |
22 | 22 | use OC\Share\MailNotifications; |
23 | -use OCP\IConfig; |
|
24 | 23 | use OCP\IL10N; |
25 | 24 | use OCP\IUser; |
26 | 25 | use OCP\Mail\IMailer; |
@@ -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(); |
@@ -145,7 +145,7 @@ |
||
145 | 145 | /** |
146 | 146 | * Returns an array with all the child nodes |
147 | 147 | * |
148 | - * @return \Sabre\DAV\INode[] |
|
148 | + * @return EntityTypeCollection[] |
|
149 | 149 | */ |
150 | 150 | function getChildren() { |
151 | 151 | $this->initCollections(); |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace OCA\Federation\Command; |
4 | 4 | |
5 | -use OCA\Federation\DbHandler; |
|
6 | 5 | use Symfony\Component\Console\Command\Command; |
7 | 6 | use Symfony\Component\Console\Helper\ProgressBar; |
8 | 7 | use Symfony\Component\Console\Input\InputInterface; |
@@ -3,10 +3,6 @@ |
||
3 | 3 | namespace OCA\Federation; |
4 | 4 | |
5 | 5 | use OCA\DAV\CardDAV\SyncService; |
6 | -use Symfony\Component\Console\Command\Command; |
|
7 | -use Symfony\Component\Console\Helper\ProgressBar; |
|
8 | -use Symfony\Component\Console\Input\InputInterface; |
|
9 | -use Symfony\Component\Console\Output\OutputInterface; |
|
10 | 6 | |
11 | 7 | class SyncFederationAddressBooks { |
12 | 8 |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * @param array $entry |
70 | - * @return array |
|
70 | + * @return string |
|
71 | 71 | */ |
72 | 72 | protected function formatCacheEntry($entry) { |
73 | 73 | if (isset($entry['path'])) { |
@@ -185,6 +185,9 @@ discard block |
||
185 | 185 | return $this->cache->getStatus($this->getSourcePath($file)); |
186 | 186 | } |
187 | 187 | |
188 | + /** |
|
189 | + * @param \OCP\Files\Cache\ICacheEntry[] $results |
|
190 | + */ |
|
188 | 191 | private function formatSearchResults($results) { |
189 | 192 | $results = array_filter($results, array($this, 'filterCacheEntry')); |
190 | 193 | $results = array_values($results); |
@@ -263,7 +266,7 @@ discard block |
||
263 | 266 | * use the one with the highest id gives the best result with the background scanner, since that is most |
264 | 267 | * likely the folder where we stopped scanning previously |
265 | 268 | * |
266 | - * @return string|bool the path of the folder or false when no folder matched |
|
269 | + * @return boolean the path of the folder or false when no folder matched |
|
267 | 270 | */ |
268 | 271 | public function getIncomplete() { |
269 | 272 | // not supported |
@@ -206,7 +206,7 @@ |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | - * @param $fileId |
|
209 | + * @param integer $fileId |
|
210 | 210 | * @return array |
211 | 211 | * @throws \OCP\Files\NotFoundException |
212 | 212 | */ |
@@ -21,14 +21,11 @@ |
||
21 | 21 | |
22 | 22 | namespace OC\Files\Config; |
23 | 23 | |
24 | -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
|
25 | -use OC\Files\Filesystem; |
|
26 | 24 | use OCP\DB\QueryBuilder\IQueryBuilder; |
27 | 25 | use OCP\Files\Config\ICachedMountInfo; |
28 | 26 | use OCP\Files\Config\IUserMountCache; |
29 | 27 | use OCP\Files\Mount\IMountPoint; |
30 | 28 | use OCP\Files\NotFoundException; |
31 | -use OCP\ICache; |
|
32 | 29 | use OCP\IDBConnection; |
33 | 30 | use OCP\ILogger; |
34 | 31 | use OCP\IUser; |
@@ -256,6 +256,11 @@ |
||
256 | 256 | */ |
257 | 257 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
258 | 258 | // FIXME This is also the reason, why it is not in the public interface |
259 | + |
|
260 | + /** |
|
261 | + * @param string|boolean $app |
|
262 | + * @param string|null $lang |
|
263 | + */ |
|
259 | 264 | public function getL10nFilesForApp($app, $lang) { |
260 | 265 | $languageFiles = []; |
261 | 266 |
@@ -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 |