@@ -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; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | * and does not take the chroot into account ) |
| 140 | 140 | * |
| 141 | 141 | * @param string $path |
| 142 | - * @return \OCP\Files\Mount\IMountPoint |
|
| 142 | + * @return Mount\MountPoint|null |
|
| 143 | 143 | */ |
| 144 | 144 | public function getMount($path) { |
| 145 | 145 | return Filesystem::getMountManager()->find($this->getAbsolutePath($path)); |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | |
| 454 | 454 | /** |
| 455 | 455 | * @param string $path |
| 456 | - * @return bool|mixed |
|
| 456 | + * @return string|boolean |
|
| 457 | 457 | */ |
| 458 | 458 | public function file_exists($path) { |
| 459 | 459 | if ($path == '/') { |
@@ -910,7 +910,7 @@ discard block |
||
| 910 | 910 | |
| 911 | 911 | /** |
| 912 | 912 | * @param string $path |
| 913 | - * @return bool|string |
|
| 913 | + * @return string|false |
|
| 914 | 914 | * @throws \OCP\Files\InvalidPathException |
| 915 | 915 | */ |
| 916 | 916 | public function toTmpFile($path) { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | * @param string $path |
| 1029 | 1029 | * @param array $hooks (optional) |
| 1030 | 1030 | * @param mixed $extraParam (optional) |
| 1031 | - * @return mixed |
|
| 1031 | + * @return string |
|
| 1032 | 1032 | * @throws \Exception |
| 1033 | 1033 | * |
| 1034 | 1034 | * This method takes requests for basic filesystem functions (e.g. reading & writing |
@@ -21,12 +21,9 @@ |
||
| 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 | 26 | use OC\Files\Storage\Storage; |
| 29 | -use OC\Memcache\ArrayCache; |
|
| 30 | 27 | use OCP\Files\Mount\IMountPoint; |
| 31 | 28 | use OCP\Lock\ILockingProvider; |
| 32 | 29 | use OC\Files\Mount\MoveableMount; |
@@ -36,7 +36,6 @@ |
||
| 36 | 36 | use OCP\Files\Mount\IMountPoint; |
| 37 | 37 | use OCP\Files\Storage; |
| 38 | 38 | use OCP\ILogger; |
| 39 | -use OCP\Files\Cache\ICacheEntry; |
|
| 40 | 39 | |
| 41 | 40 | class CustomEncryption extends Wrapper { |
| 42 | 41 | |
@@ -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, |
@@ -385,7 +384,7 @@ discard block |
||
| 385 | 384 | * @param string $path |
| 386 | 385 | * @param string $mode |
| 387 | 386 | * @param string|null $sourceFileOfRename |
| 388 | - * @return resource|bool |
|
| 387 | + * @return resource |
|
| 389 | 388 | * @throws GenericEncryptionException |
| 390 | 389 | * @throws ModuleDoesNotExistsException |
| 391 | 390 | */ |
@@ -514,6 +513,10 @@ discard block |
||
| 514 | 513 | return $this->storage->fopen($path, $mode); |
| 515 | 514 | } |
| 516 | 515 | |
| 516 | + /** |
|
| 517 | + * @param string $path |
|
| 518 | + * @param string $mode |
|
| 519 | + */ |
|
| 517 | 520 | public function fopenStorage($path, $mode) { |
| 518 | 521 | return fopen($this->storage->getSourcePath($path), $mode); |
| 519 | 522 | } |
@@ -529,7 +532,7 @@ discard block |
||
| 529 | 532 | * @param string $uid |
| 530 | 533 | * @param \OCP\Encryption\IEncryptionModule $encryptionModule |
| 531 | 534 | * @param \OC\Files\Storage\Storage $storage |
| 532 | - * @param \OC\Files\Storage\Wrapper\Encryption $encStorage |
|
| 535 | + * @param CustomEncryption $encStorage |
|
| 533 | 536 | * @param \OC\Encryption\Util $util |
| 534 | 537 | * @param \OC\Encryption\File $file |
| 535 | 538 | * @param string $mode |
@@ -1139,7 +1142,7 @@ discard block |
||
| 1139 | 1142 | /** |
| 1140 | 1143 | * check if path points to a files version |
| 1141 | 1144 | * |
| 1142 | - * @param $path |
|
| 1145 | + * @param string $path |
|
| 1143 | 1146 | * @return bool |
| 1144 | 1147 | */ |
| 1145 | 1148 | protected function isVersion($path) { |
@@ -628,7 +628,6 @@ discard block |
||
| 628 | 628 | * @param string $sourceInternalPath |
| 629 | 629 | * @param string $targetInternalPath |
| 630 | 630 | * @param bool $preserveMtime |
| 631 | - * @param bool $isRename |
|
| 632 | 631 | * @return bool |
| 633 | 632 | */ |
| 634 | 633 | public function copyFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { |
@@ -692,7 +691,6 @@ discard block |
||
| 692 | 691 | * @param string $sourceInternalPath |
| 693 | 692 | * @param string $targetInternalPath |
| 694 | 693 | * @param bool $preserveMtime |
| 695 | - * @param bool $isRename |
|
| 696 | 694 | * @return bool |
| 697 | 695 | * @throws \Exception |
| 698 | 696 | */ |
@@ -999,7 +997,7 @@ discard block |
||
| 999 | 997 | /** |
| 1000 | 998 | * check if path points to a files version |
| 1001 | 999 | * |
| 1002 | - * @param $path |
|
| 1000 | + * @param string $path |
|
| 1003 | 1001 | * @return bool |
| 1004 | 1002 | */ |
| 1005 | 1003 | protected function isVersion($path) { |