@@ -62,7 +62,6 @@ |
||
| 62 | 62 | use OC\Files\Mount\MountPoint; |
| 63 | 63 | use OC\Files\Storage\StorageFactory; |
| 64 | 64 | use OCP\Files\Config\IMountProvider; |
| 65 | -use OCP\Files\Mount\IMountPoint; |
|
| 66 | 65 | use OCP\Files\NotFoundException; |
| 67 | 66 | use OCP\IUserManager; |
| 68 | 67 | |
@@ -360,6 +360,10 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | + /** |
|
| 364 | + * @param string|boolean $user |
|
| 365 | + * @param string $root |
|
| 366 | + */ |
|
| 363 | 367 | static public function init($user, $root) { |
| 364 | 368 | if (self::$defaultInstance) { |
| 365 | 369 | return false; |
@@ -517,7 +521,7 @@ discard block |
||
| 517 | 521 | /** |
| 518 | 522 | * mount an \OC\Files\Storage\Storage in our virtual filesystem |
| 519 | 523 | * |
| 520 | - * @param \OC\Files\Storage\Storage|string $class |
|
| 524 | + * @param string $class |
|
| 521 | 525 | * @param array $arguments |
| 522 | 526 | * @param string $mountpoint |
| 523 | 527 | */ |
@@ -690,6 +694,9 @@ discard block |
||
| 690 | 694 | return self::$defaultInstance->is_dir($path); |
| 691 | 695 | } |
| 692 | 696 | |
| 697 | + /** |
|
| 698 | + * @param string $path |
|
| 699 | + */ |
|
| 693 | 700 | static public function is_file($path) { |
| 694 | 701 | return self::$defaultInstance->is_file($path); |
| 695 | 702 | } |
@@ -702,6 +709,9 @@ discard block |
||
| 702 | 709 | return self::$defaultInstance->filetype($path); |
| 703 | 710 | } |
| 704 | 711 | |
| 712 | + /** |
|
| 713 | + * @param string $path |
|
| 714 | + */ |
|
| 705 | 715 | static public function filesize($path) { |
| 706 | 716 | return self::$defaultInstance->filesize($path); |
| 707 | 717 | } |
@@ -714,6 +724,9 @@ discard block |
||
| 714 | 724 | return self::$defaultInstance->isCreatable($path); |
| 715 | 725 | } |
| 716 | 726 | |
| 727 | + /** |
|
| 728 | + * @param string $path |
|
| 729 | + */ |
|
| 717 | 730 | static public function isReadable($path) { |
| 718 | 731 | return self::$defaultInstance->isReadable($path); |
| 719 | 732 | } |
@@ -726,6 +739,9 @@ discard block |
||
| 726 | 739 | return self::$defaultInstance->isDeletable($path); |
| 727 | 740 | } |
| 728 | 741 | |
| 742 | + /** |
|
| 743 | + * @param string $path |
|
| 744 | + */ |
|
| 729 | 745 | static public function isSharable($path) { |
| 730 | 746 | return self::$defaultInstance->isSharable($path); |
| 731 | 747 | } |
@@ -743,6 +759,7 @@ discard block |
||
| 743 | 759 | } |
| 744 | 760 | |
| 745 | 761 | /** |
| 762 | + * @param string $path |
|
| 746 | 763 | * @return string |
| 747 | 764 | */ |
| 748 | 765 | static public function file_get_contents($path) { |
@@ -765,6 +782,10 @@ discard block |
||
| 765 | 782 | return self::$defaultInstance->copy($path1, $path2); |
| 766 | 783 | } |
| 767 | 784 | |
| 785 | + /** |
|
| 786 | + * @param string $path |
|
| 787 | + * @param string $mode |
|
| 788 | + */ |
|
| 768 | 789 | static public function fopen($path, $mode) { |
| 769 | 790 | return self::$defaultInstance->fopen($path, $mode); |
| 770 | 791 | } |
@@ -780,6 +801,9 @@ discard block |
||
| 780 | 801 | return self::$defaultInstance->fromTmpFile($tmpFile, $path); |
| 781 | 802 | } |
| 782 | 803 | |
| 804 | + /** |
|
| 805 | + * @param string $path |
|
| 806 | + */ |
|
| 783 | 807 | static public function getMimeType($path) { |
| 784 | 808 | return self::$defaultInstance->getMimeType($path); |
| 785 | 809 | } |
@@ -792,6 +816,9 @@ discard block |
||
| 792 | 816 | return self::$defaultInstance->free_space($path); |
| 793 | 817 | } |
| 794 | 818 | |
| 819 | + /** |
|
| 820 | + * @param string $query |
|
| 821 | + */ |
|
| 795 | 822 | static public function search($query) { |
| 796 | 823 | return self::$defaultInstance->search($query); |
| 797 | 824 | } |
@@ -900,7 +927,7 @@ discard block |
||
| 900 | 927 | * @param string $path |
| 901 | 928 | * @param boolean $includeMountPoints whether to add mountpoint sizes, |
| 902 | 929 | * defaults to true |
| 903 | - * @return \OC\Files\FileInfo|bool False if file does not exist |
|
| 930 | + * @return \OCP\Files\FileInfo|null False if file does not exist |
|
| 904 | 931 | */ |
| 905 | 932 | public static function getFileInfo($path, $includeMountPoints = true) { |
| 906 | 933 | return self::$defaultInstance->getFileInfo($path, $includeMountPoints); |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * Magic method to first get the real rootFolder and then |
| 35 | 35 | * call $method with $args on it |
| 36 | 36 | * |
| 37 | - * @param $method |
|
| 37 | + * @param string $method |
|
| 38 | 38 | * @param $args |
| 39 | 39 | * @return mixed |
| 40 | 40 | */ |
@@ -20,9 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | namespace OC\Files\Node; |
| 22 | 22 | |
| 23 | -use OC\Files\Mount\MountPoint; |
|
| 24 | 23 | use OCP\Files\IRootFolder; |
| 25 | -use OCP\Files\NotPermittedException; |
|
| 26 | 24 | |
| 27 | 25 | /** |
| 28 | 26 | * Class LazyRoot |
@@ -99,6 +99,7 @@ discard block |
||
| 99 | 99 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 100 | 100 | * @param \OCP\Lock\ILockingProvider $provider |
| 101 | 101 | * @throws \OCP\Lock\LockedException |
| 102 | + * @return void |
|
| 102 | 103 | */ |
| 103 | 104 | public function acquireLock($path, $type, ILockingProvider $provider); |
| 104 | 105 | |
@@ -106,6 +107,7 @@ discard block |
||
| 106 | 107 | * @param string $path The path of the file to release the lock for |
| 107 | 108 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 108 | 109 | * @param \OCP\Lock\ILockingProvider $provider |
| 110 | + * @return void |
|
| 109 | 111 | */ |
| 110 | 112 | public function releaseLock($path, $type, ILockingProvider $provider); |
| 111 | 113 | |
@@ -114,6 +116,7 @@ discard block |
||
| 114 | 116 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 115 | 117 | * @param \OCP\Lock\ILockingProvider $provider |
| 116 | 118 | * @throws \OCP\Lock\LockedException |
| 119 | + * @return void |
|
| 117 | 120 | */ |
| 118 | 121 | public function changeLock($path, $type, ILockingProvider $provider); |
| 119 | 122 | } |
@@ -159,7 +159,7 @@ |
||
| 159 | 159 | * Checks whether the given path is a part file |
| 160 | 160 | * |
| 161 | 161 | * @param string $path Path that may identify a .part file |
| 162 | - * @return string File path without .part extension |
|
| 162 | + * @return boolean File path without .part extension |
|
| 163 | 163 | * @note this is needed for reusing keys |
| 164 | 164 | */ |
| 165 | 165 | private function isPartFile($path) { |
@@ -144,6 +144,9 @@ |
||
| 144 | 144 | return true; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | + /** |
|
| 148 | + * @param string $path |
|
| 149 | + */ |
|
| 147 | 150 | public function url_stat($path) { |
| 148 | 151 | if (isset(self::$data[$path])) { |
| 149 | 152 | $size = strlen(self::$data[$path]); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | /** |
| 94 | 94 | * Formats the date of the given timestamp |
| 95 | 95 | * |
| 96 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
| 96 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
| 97 | 97 | * @param string $format Either 'full', 'long', 'medium' or 'short' |
| 98 | 98 | * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' |
| 99 | 99 | * long: e.g. 'MMMM d, y' => 'August 20, 2014' |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | /** |
| 193 | 193 | * Gives the relative past time of the timestamp |
| 194 | 194 | * |
| 195 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
| 195 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
| 196 | 196 | * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time |
| 197 | 197 | * @return string Dates returned are: |
| 198 | 198 | * < 60 sec => seconds ago |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | /** |
| 229 | 229 | * Formats the date and time of the given timestamp |
| 230 | 230 | * |
| 231 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
| 231 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
| 232 | 232 | * @param string $formatDate See formatDate() for description |
| 233 | 233 | * @param string $formatTime See formatTime() for description |
| 234 | 234 | * @param \DateTimeZone $timeZone The timezone to use |
@@ -383,6 +383,14 @@ discard block |
||
| 383 | 383 | return $size; |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | + /** |
|
| 387 | + * @param string $path |
|
| 388 | + * @param boolean $recursive |
|
| 389 | + * @param integer $reuse |
|
| 390 | + * @param integer|null $folderId |
|
| 391 | + * @param boolean $lock |
|
| 392 | + * @param integer $size |
|
| 393 | + */ |
|
| 386 | 394 | private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) { |
| 387 | 395 | // we put this in it's own function so it cleans up the memory before we start recursing |
| 388 | 396 | $existingChildren = $this->getExistingChildren($folderId); |
@@ -479,6 +487,9 @@ discard block |
||
| 479 | 487 | } |
| 480 | 488 | } |
| 481 | 489 | |
| 490 | + /** |
|
| 491 | + * @param string|boolean $path |
|
| 492 | + */ |
|
| 482 | 493 | private function runBackgroundScanJob(callable $callback, $path) { |
| 483 | 494 | try { |
| 484 | 495 | $callback(); |
@@ -923,7 +923,7 @@ |
||
| 923 | 923 | * @param int $previewWidth |
| 924 | 924 | * @param int $previewHeight |
| 925 | 925 | * |
| 926 | - * @return int[] |
|
| 926 | + * @return double[] |
|
| 927 | 927 | */ |
| 928 | 928 | private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 929 | 929 | $scalingUp = $this->getScalingUp(); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * Returns expensive repair steps to be run on the |
| 143 | 143 | * command line with a special option. |
| 144 | 144 | * |
| 145 | - * @return IRepairStep[] |
|
| 145 | + * @return OldGroupMembershipShares[] |
|
| 146 | 146 | */ |
| 147 | 147 | public static function getExpensiveRepairSteps() { |
| 148 | 148 | return [ |
@@ -218,7 +218,6 @@ discard block |
||
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
| 221 | - * @param int $max |
|
| 222 | 221 | */ |
| 223 | 222 | public function finishProgress() { |
| 224 | 223 | // for now just emit as we did in the past |