@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use OC\Encryption\Manager; |
| 29 | 29 | use OC\Files\CustomView; |
| 30 | 30 | use OC\Files\Filesystem; |
| 31 | -use OC\Files\Storage\Wrapper\Wrapper; |
|
| 32 | 31 | use OC\Files\View; |
| 33 | 32 | use OC\Memcache\ArrayCache; |
| 34 | 33 | use OCP\Files\FileInfo; |
@@ -24,7 +24,6 @@ discard block |
||
| 24 | 24 | use OC\Encryption\Exceptions\ModuleDoesNotExistsException; |
| 25 | 25 | use OC\Encryption\Update; |
| 26 | 26 | use OC\Encryption\Util; |
| 27 | -use OC\Files\Cache\CacheEntry; |
|
| 28 | 27 | use OC\Files\Filesystem; |
| 29 | 28 | use OC\Files\Mount\Manager; |
| 30 | 29 | use OC\Files\Storage\LocalTempFileTrait; |
@@ -36,7 +35,6 @@ discard block |
||
| 36 | 35 | use OCP\Files\Mount\IMountPoint; |
| 37 | 36 | use OCP\Files\Storage; |
| 38 | 37 | use OCP\ILogger; |
| 39 | -use OCP\Files\Cache\ICacheEntry; |
|
| 40 | 38 | |
| 41 | 39 | class CustomEncryption extends Wrapper { |
| 42 | 40 | |
@@ -98,7 +98,6 @@ discard block |
||
| 98 | 98 | * @param Update $update |
| 99 | 99 | * @param Manager $mountManager |
| 100 | 100 | * @param ArrayCache $arrayCache |
| 101 | - * @param Encryption $encryptionWrapper |
|
| 102 | 101 | */ |
| 103 | 102 | public function __construct( |
| 104 | 103 | $parameters, |
@@ -168,7 +167,7 @@ discard block |
||
| 168 | 167 | * @param string $mode |
| 169 | 168 | * @param string|null $sourceFileOfRename |
| 170 | 169 | * @param bool $getDecryptedFile |
| 171 | - * @return resource|bool |
|
| 170 | + * @return resource |
|
| 172 | 171 | * @throws GenericEncryptionException |
| 173 | 172 | * @throws ModuleDoesNotExistsException |
| 174 | 173 | */ |
@@ -287,6 +286,10 @@ discard block |
||
| 287 | 286 | return $this->storage->fopen($path, $mode); |
| 288 | 287 | } |
| 289 | 288 | |
| 289 | + /** |
|
| 290 | + * @param string $path |
|
| 291 | + * @param string $mode |
|
| 292 | + */ |
|
| 290 | 293 | public function fopenStorage($path, $mode) { |
| 291 | 294 | return fopen($this->storage->getSourcePath($path), $mode); |
| 292 | 295 | } |
@@ -624,7 +627,7 @@ discard block |
||
| 624 | 627 | /** |
| 625 | 628 | * check if path points to a files version |
| 626 | 629 | * |
| 627 | - * @param $path |
|
| 630 | + * @param string $path |
|
| 628 | 631 | * @return bool |
| 629 | 632 | */ |
| 630 | 633 | protected function isVersion($path) { |