@@ -39,7 +39,6 @@ |
||
39 | 39 | use OCA\DAV\Connector\Sabre\Exception\Forbidden; |
40 | 40 | use OCA\DAV\Connector\Sabre\Exception\InvalidPath; |
41 | 41 | use OCP\Files\ForbiddenException; |
42 | -use OCP\Files\Storage\IPersistentLockingStorage; |
|
43 | 42 | use OCP\Share\Exceptions\ShareNotFound; |
44 | 43 | use OCP\Share\IManager; |
45 | 44 |
@@ -30,7 +30,6 @@ |
||
30 | 30 | use OCP\Lock\LockedException; |
31 | 31 | use Sabre\DAV\Exception\Forbidden; |
32 | 32 | use Sabre\DAV\Exception\NotFound; |
33 | -use Sabre\DAV\Exception\NotImplemented; |
|
34 | 33 | use Sabre\DAV\Locks\LockInfo; |
35 | 34 | use Sabre\DAV\ServerPlugin; |
36 | 35 | use Sabre\HTTP\RequestInterface; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | /** |
60 | 60 | * @param RequestInterface $request |
61 | 61 | * @param ResponseInterface $response |
62 | - * @return bool|void |
|
62 | + * @return null|false |
|
63 | 63 | * @throws \Sabre\DAV\Exception\BadRequest |
64 | 64 | * @throws \Sabre\DAV\Exception\Conflict |
65 | 65 | * @throws \Sabre\DAV\Exception\NotFound |
@@ -259,6 +259,9 @@ discard block |
||
259 | 259 | |
260 | 260 | /** |
261 | 261 | * |
262 | + * @param string $targetFilename |
|
263 | + * @param string $targetLocation |
|
264 | + * @param integer $timestamp |
|
262 | 265 | */ |
263 | 266 | public static function insertTrashEntry($user, $targetFilename, $targetLocation, $timestamp) { |
264 | 267 | $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); |
@@ -784,7 +787,7 @@ discard block |
||
784 | 787 | * if the size limit for the trash bin is reached, we delete the oldest |
785 | 788 | * files in the trash bin until we meet the limit again |
786 | 789 | * |
787 | - * @param array $files |
|
790 | + * @param \OCP\Files\FileInfo[] $files |
|
788 | 791 | * @param string $user |
789 | 792 | * @param int $availableSpace available disc space |
790 | 793 | * @return int size of deleted files |
@@ -818,7 +821,7 @@ discard block |
||
818 | 821 | /** |
819 | 822 | * delete files older then max storage time |
820 | 823 | * |
821 | - * @param array $files list of files sorted by mtime |
|
824 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
822 | 825 | * @param string $user |
823 | 826 | * @return integer[] size of deleted files and number of deleted files |
824 | 827 | */ |
@@ -888,6 +891,7 @@ discard block |
||
888 | 891 | * |
889 | 892 | * @param string $filename name of the file which should be restored |
890 | 893 | * @param int $timestamp timestamp when the file was deleted |
894 | + * @param string|boolean $user |
|
891 | 895 | * @return array |
892 | 896 | */ |
893 | 897 | private static function getVersionsFromTrash($filename, $timestamp, $user) { |
@@ -708,7 +708,7 @@ |
||
708 | 708 | } |
709 | 709 | |
710 | 710 | /** |
711 | - * @param $internalPath |
|
711 | + * @param string $internalPath |
|
712 | 712 | * @return array |
713 | 713 | */ |
714 | 714 | public function convertInternalPathToGlobalPath($internalPath) { |
@@ -53,7 +53,6 @@ |
||
53 | 53 | use OCP\Files\InvalidPathException; |
54 | 54 | use OCP\Files\ReservedWordException; |
55 | 55 | use OCP\Files\Storage\ILockingStorage; |
56 | -use OCP\Files\Storage\IStorage; |
|
57 | 56 | use OCP\Files\Storage\IPersistentLockingStorage; |
58 | 57 | use OCP\Files\Storage\IVersionedStorage; |
59 | 58 | use OCP\Lock\ILockingProvider; |
@@ -20,14 +20,11 @@ |
||
20 | 20 | */ |
21 | 21 | namespace OCA\DAV\JobStatus; |
22 | 22 | |
23 | -use OCA\DAV\DAV\LazyOpsPlugin; |
|
24 | 23 | use OCA\DAV\JobStatus\Entity\JobStatusMapper; |
25 | 24 | use OCP\AppFramework\Db\DoesNotExistException; |
26 | 25 | use Sabre\DAV\Collection; |
27 | -use Sabre\DAV\Exception\Forbidden; |
|
28 | 26 | use Sabre\DAV\Exception\MethodNotAllowed; |
29 | 27 | use Sabre\DAV\Exception\NotFound; |
30 | -use Sabre\DAV\SimpleFile; |
|
31 | 28 | use Sabre\HTTP\URLUtil; |
32 | 29 | |
33 | 30 | class Home extends Collection { |
@@ -255,7 +255,7 @@ |
||
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
258 | - * @param $user |
|
258 | + * @param \OCP\IUser|null $user |
|
259 | 259 | * @throws ServiceUnavailable |
260 | 260 | */ |
261 | 261 | private function checkAccountModule($user) { |
@@ -315,6 +315,9 @@ |
||
315 | 315 | } |
316 | 316 | } |
317 | 317 | |
318 | + /** |
|
319 | + * @param string $revision |
|
320 | + */ |
|
318 | 321 | public static function restoreVersion($uid, $filename, $fileToRestore, $revision) { |
319 | 322 | if (\OC::$server->getConfig()->getSystemValue('files_versions', Storage::DEFAULTENABLED) !== true) { |
320 | 323 | return false; |
@@ -24,7 +24,6 @@ |
||
24 | 24 | namespace OC\Files\Storage; |
25 | 25 | |
26 | 26 | use OC\Files\Cache\FailedCache; |
27 | -use OCP\Files\Storage\IStorage; |
|
28 | 27 | use \OCP\Lock\ILockingProvider; |
29 | 28 | use \OCP\Files\StorageNotAvailableException; |
30 | 29 |