@@ -24,7 +24,6 @@ |
||
24 | 24 | namespace OCA\Files_Sharing\API; |
25 | 25 | |
26 | 26 | use OC\Files\Filesystem; |
27 | -use OCA\FederatedFileSharing\DiscoveryManager; |
|
28 | 27 | use OCA\Files_Sharing\External\Manager; |
29 | 28 | use Symfony\Component\EventDispatcher\GenericEvent; |
30 | 29 |
@@ -27,7 +27,6 @@ |
||
27 | 27 | |
28 | 28 | use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; |
29 | 29 | use OC\AppFramework\Utility\ControllerMethodReflector; |
30 | -use OC\Authentication\Exceptions\PasswordLoginForbiddenException; |
|
31 | 30 | use OCP\AppFramework\Controller; |
32 | 31 | use OCP\AppFramework\Http; |
33 | 32 | use OCP\AppFramework\Http\JSONResponse; |
@@ -218,6 +218,9 @@ discard block |
||
218 | 218 | |
219 | 219 | /** |
220 | 220 | * |
221 | + * @param string $targetFilename |
|
222 | + * @param string $targetLocation |
|
223 | + * @param integer $timestamp |
|
221 | 224 | */ |
222 | 225 | public static function insertTrashEntry($user, $targetFilename, $targetLocation, $timestamp) { |
223 | 226 | $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); |
@@ -330,6 +333,7 @@ discard block |
||
330 | 333 | * @param string $ownerPath path relative to the owner's home storage |
331 | 334 | * @param integer $timestamp when the file was deleted |
332 | 335 | * @param bool $forceCopy true to only make a copy of the versions into the trashbin |
336 | + * @param \OC\Files\Storage\Storage $sourceStorage |
|
333 | 337 | */ |
334 | 338 | private static function retainVersions($filename, $owner, $ownerPath, $timestamp, $sourceStorage = null, $forceCopy = false) { |
335 | 339 | if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) { |
@@ -780,7 +784,7 @@ discard block |
||
780 | 784 | * if the size limit for the trash bin is reached, we delete the oldest |
781 | 785 | * files in the trash bin until we meet the limit again |
782 | 786 | * |
783 | - * @param array $files |
|
787 | + * @param \OCP\Files\FileInfo[] $files |
|
784 | 788 | * @param string $user |
785 | 789 | * @param int $availableSpace available disc space |
786 | 790 | * @return int size of deleted files |
@@ -808,7 +812,7 @@ discard block |
||
808 | 812 | /** |
809 | 813 | * delete files older then max storage time |
810 | 814 | * |
811 | - * @param array $files list of files sorted by mtime |
|
815 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
812 | 816 | * @param string $user |
813 | 817 | * @return integer[] size of deleted files and number of deleted files |
814 | 818 | */ |
@@ -122,6 +122,9 @@ |
||
122 | 122 | } |
123 | 123 | } |
124 | 124 | |
125 | + /** |
|
126 | + * @param integer $name |
|
127 | + */ |
|
125 | 128 | private function buildController($name) { |
126 | 129 | $parts = explode('.', $name); |
127 | 130 | if (count($parts) === 4 && $parts[0] === 'ocs') { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $wrongPath wrong path of the entry to fix |
98 | 98 | * @param int $correctStorageNumericId numeric idea of the correct storage |
99 | 99 | * @param string $correctPath value to which to set the path of the entry |
100 | - * @return bool true for success |
|
100 | + * @return boolean|null true for success |
|
101 | 101 | */ |
102 | 102 | private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) { |
103 | 103 | // delete target if exists |
@@ -122,6 +122,9 @@ discard block |
||
122 | 122 | $out->advance(1, $text); |
123 | 123 | } |
124 | 124 | |
125 | + /** |
|
126 | + * @param IQueryBuilder $qb |
|
127 | + */ |
|
125 | 128 | private function addQueryConditionsParentIdWrongPath($qb) { |
126 | 129 | // thanks, VicDeo! |
127 | 130 | if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { |
@@ -161,6 +164,9 @@ discard block |
||
161 | 164 | } |
162 | 165 | } |
163 | 166 | |
167 | + /** |
|
168 | + * @param IQueryBuilder $qb |
|
169 | + */ |
|
164 | 170 | private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) { |
165 | 171 | // Subquery for parent existence |
166 | 172 | $qbe = $this->connection->getQueryBuilder(); |
@@ -190,6 +196,9 @@ discard block |
||
190 | 196 | } |
191 | 197 | } |
192 | 198 | |
199 | + /** |
|
200 | + * @param integer $storageNumericId |
|
201 | + */ |
|
193 | 202 | private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { |
194 | 203 | $qb = $this->connection->getQueryBuilder(); |
195 | 204 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -200,6 +209,9 @@ discard block |
||
200 | 209 | return $count; |
201 | 210 | } |
202 | 211 | |
212 | + /** |
|
213 | + * @param integer $storageNumericId |
|
214 | + */ |
|
203 | 215 | private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) { |
204 | 216 | $qb = $this->connection->getQueryBuilder(); |
205 | 217 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -350,6 +362,7 @@ discard block |
||
350 | 362 | * |
351 | 363 | * @param int $storageId storage id |
352 | 364 | * @param string $path path for which to create the parent entry |
365 | + * @param integer $reuseFileId |
|
353 | 366 | * @return int file id of the newly created parent |
354 | 367 | */ |
355 | 368 | private function getOrCreateEntry($storageId, $path, $reuseFileId = null) { |
@@ -21,8 +21,6 @@ |
||
21 | 21 | |
22 | 22 | namespace OC\Repair; |
23 | 23 | |
24 | -use Doctrine\DBAL\Platforms\PostgreSqlPlatform; |
|
25 | -use OCP\DB\QueryBuilder\IQueryBuilder; |
|
26 | 24 | use OCP\Migration\IOutput; |
27 | 25 | use OCP\Migration\IRepairStep; |
28 | 26 | use Doctrine\DBAL\Platforms\MySqlPlatform; |
@@ -50,6 +50,9 @@ |
||
50 | 50 | return $location; |
51 | 51 | } |
52 | 52 | |
53 | + /** |
|
54 | + * @param string $path |
|
55 | + */ |
|
53 | 56 | public function buildPath($path) { |
54 | 57 | $location = parent::buildPath($path); |
55 | 58 | if ($this->isCaseInsensitiveStorage) { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * @param string $path |
175 | 175 | * @throws \OCP\Files\NotFoundException |
176 | 176 | * @throws \OCP\Files\NotPermittedException |
177 | - * @return string |
|
177 | + * @return \OCP\Files\Node |
|
178 | 178 | */ |
179 | 179 | public function get($path) { |
180 | 180 | $path = $this->normalizePath($path); |
@@ -371,6 +371,9 @@ discard block |
||
371 | 371 | |
372 | 372 | } |
373 | 373 | |
374 | + /** |
|
375 | + * @param string $fullPath |
|
376 | + */ |
|
374 | 377 | private function resolveVirtualNode($fullPath) { |
375 | 378 | $pieces = explode('/', $fullPath); |
376 | 379 | if ($pieces[1] !== 'meta') { |
@@ -204,7 +204,7 @@ |
||
204 | 204 | |
205 | 205 | /** |
206 | 206 | * @param string $path |
207 | - * @return INode|null |
|
207 | + * @return null|Node |
|
208 | 208 | */ |
209 | 209 | protected function getNodeForPath($path){ |
210 | 210 | $node = parent::getNodeForPath($path); |
@@ -47,7 +47,6 @@ |
||
47 | 47 | use OCP\Files\StorageNotAvailableException; |
48 | 48 | use OCP\Util; |
49 | 49 | use Sabre\DAV\Xml\Property\ResourceType; |
50 | -use Sabre\HTTP\ClientException; |
|
51 | 50 | use Sabre\HTTP\ClientHttpException; |
52 | 51 | use Sabre\DAV\Exception\InsufficientStorage; |
53 | 52 | use OCA\DAV\Connector\Sabre\Exception\Forbidden; |