@@ -140,6 +140,7 @@ |
||
| 140 | 140 | * @param int $headerSize |
| 141 | 141 | * @param bool $signed |
| 142 | 142 | * @param string $wrapper stream wrapper class |
| 143 | + * @param string $sourceFileOfRename |
|
| 143 | 144 | * @return resource |
| 144 | 145 | * |
| 145 | 146 | * @throws \BadMethodCallException |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | * |
| 91 | 91 | * @param string $path source path |
| 92 | 92 | * @param string $destination destination path |
| 93 | - * @return bool|void false to stop handling, void to skip this handler |
|
| 93 | + * @return null|false false to stop handling, void to skip this handler |
|
| 94 | 94 | */ |
| 95 | 95 | public function performMove($path, $destination) { |
| 96 | 96 | if (!$this->server->tree->nodeExists($destination)) { |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | namespace OCA\DAV\Upload; |
| 24 | 24 | |
| 25 | 25 | |
| 26 | -use OCA\DAV\Connector\Sabre\File; |
|
| 27 | 26 | use Sabre\DAV\Exception\BadRequest; |
| 28 | 27 | use Sabre\DAV\Server; |
| 29 | 28 | use Sabre\DAV\ServerPlugin; |
@@ -171,7 +171,7 @@ |
||
| 171 | 171 | * Returns an associative array with all translations |
| 172 | 172 | * |
| 173 | 173 | * Called by String |
| 174 | - * @return array |
|
| 174 | + * @return string[] |
|
| 175 | 175 | */ |
| 176 | 176 | public function getTranslations() { |
| 177 | 177 | return $this->translations; |
@@ -100,8 +100,8 @@ |
||
| 100 | 100 | /** |
| 101 | 101 | * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" |
| 102 | 102 | * @param int $timestamp unix timestamp |
| 103 | - * @param boolean $dateOnly |
|
| 104 | - * @return \OC\L10N\L10NString human readable interpretation of the timestamp |
|
| 103 | + * @param integer $dateOnly |
|
| 104 | + * @return string human readable interpretation of the timestamp |
|
| 105 | 105 | * |
| 106 | 106 | * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead |
| 107 | 107 | */ |
@@ -248,6 +248,9 @@ discard block |
||
| 248 | 248 | return '"' . $this->info->getEtag() . '"'; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | + /** |
|
| 252 | + * @param string $path |
|
| 253 | + */ |
|
| 251 | 254 | private function getPartFileBasePath($path) { |
| 252 | 255 | $partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true); |
| 253 | 256 | if ($partFileInStorage) { |
@@ -617,7 +620,7 @@ discard block |
||
| 617 | 620 | /** |
| 618 | 621 | * Set $algo to get a specific checksum, leave null to get all checksums |
| 619 | 622 | * (space seperated) |
| 620 | - * @param null $algo |
|
| 623 | + * @param string $algo |
|
| 621 | 624 | * @return string |
| 622 | 625 | */ |
| 623 | 626 | public function getChecksum($algo = null) { |
@@ -640,6 +643,9 @@ discard block |
||
| 640 | 643 | return ''; |
| 641 | 644 | } |
| 642 | 645 | |
| 646 | + /** |
|
| 647 | + * @param string $string |
|
| 648 | + */ |
|
| 643 | 649 | protected function header($string) { |
| 644 | 650 | \header($string); |
| 645 | 651 | } |
@@ -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; |