@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * see http://php.net/manual/en/function.filetype.php |
133 | 133 | * |
134 | 134 | * @param string $path |
135 | - * @return bool |
|
135 | + * @return string|false |
|
136 | 136 | */ |
137 | 137 | public function filetype($path) { |
138 | 138 | return $this->getWrapperStorage()->filetype($path); |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | /** |
462 | 462 | * Returns true |
463 | 463 | * |
464 | - * @return true |
|
464 | + * @return boolean |
|
465 | 465 | */ |
466 | 466 | public function test() { |
467 | 467 | return $this->getWrapperStorage()->test(); |
@@ -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; |
@@ -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, |
@@ -148,7 +147,7 @@ discard block |
||
148 | 147 | * @param string $path |
149 | 148 | * @param string $mode |
150 | 149 | * @param string|null $sourceFileOfRename |
151 | - * @return resource|bool |
|
150 | + * @return resource |
|
152 | 151 | * @throws GenericEncryptionException |
153 | 152 | * @throws ModuleDoesNotExistsException |
154 | 153 | */ |
@@ -257,6 +256,10 @@ discard block |
||
257 | 256 | return $this->storage->fopen($path, $mode); |
258 | 257 | } |
259 | 258 | |
259 | + /** |
|
260 | + * @param string $path |
|
261 | + * @param string $mode |
|
262 | + */ |
|
260 | 263 | public function fopenStorage($path, $mode) { |
261 | 264 | return fopen($this->storage->getSourcePath($path), $mode); |
262 | 265 | } |
@@ -590,7 +593,7 @@ discard block |
||
590 | 593 | /** |
591 | 594 | * check if path points to a files version |
592 | 595 | * |
593 | - * @param $path |
|
596 | + * @param string $path |
|
594 | 597 | * @return bool |
595 | 598 | */ |
596 | 599 | protected function isVersion($path) { |
@@ -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 |
@@ -21,13 +21,8 @@ |
||
21 | 21 | |
22 | 22 | namespace OC\Files; |
23 | 23 | |
24 | -use OC\Encryption\CustomEncryptionWrapper; |
|
25 | -use OC\Encryption\Manager; |
|
26 | 24 | use OC\Files\Cache; |
27 | 25 | use OC\Files\Filesystem; |
28 | -use OC\Files\Storage\Storage; |
|
29 | -use OC\Memcache\ArrayCache; |
|
30 | -use OCP\Files\Mount\IMountPoint; |
|
31 | 26 | use OCP\Lock\ILockingProvider; |
32 | 27 | use OC\Files\Mount\MoveableMount; |
33 | 28 | use OCP\Lock\LockedException; |