@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | * If an SQLLogger is configured, the execution is logged. |
| 174 | 174 | * |
| 175 | 175 | * @param string $query The SQL query to execute. |
| 176 | - * @param array $params The parameters to bind to the query, if any. |
|
| 176 | + * @param string[] $params The parameters to bind to the query, if any. |
|
| 177 | 177 | * @param array $types The types the previous parameters are in. |
| 178 | 178 | * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp The query cache profile, optional. |
| 179 | 179 | * |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * columns or sequences. |
| 219 | 219 | * |
| 220 | 220 | * @param string $seqName Name of the sequence object from which the ID should be returned. |
| 221 | - * @return string A string representation of the last inserted ID. |
|
| 221 | + * @return integer A string representation of the last inserted ID. |
|
| 222 | 222 | */ |
| 223 | 223 | public function lastInsertId($seqName = null) { |
| 224 | 224 | if ($seqName) { |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | use OC\Files\Filesystem; |
| 31 | 31 | use OC\Files\View; |
| 32 | 32 | use OCP\Encryption\IEncryptionModule; |
| 33 | -use OCP\Files\Storage; |
|
| 34 | 33 | use OCP\IConfig; |
| 35 | 34 | |
| 36 | 35 | class Util { |
@@ -386,6 +386,14 @@ discard block |
||
| 386 | 386 | return $size; |
| 387 | 387 | } |
| 388 | 388 | |
| 389 | + /** |
|
| 390 | + * @param string $path |
|
| 391 | + * @param boolean $recursive |
|
| 392 | + * @param integer $reuse |
|
| 393 | + * @param integer|null $folderId |
|
| 394 | + * @param boolean $lock |
|
| 395 | + * @param integer $size |
|
| 396 | + */ |
|
| 389 | 397 | private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) { |
| 390 | 398 | // we put this in it's own function so it cleans up the memory before we start recursing |
| 391 | 399 | $existingChildren = $this->getExistingChildren($folderId); |
@@ -485,6 +493,9 @@ discard block |
||
| 485 | 493 | } |
| 486 | 494 | } |
| 487 | 495 | |
| 496 | + /** |
|
| 497 | + * @param string|boolean $path |
|
| 498 | + */ |
|
| 488 | 499 | private function runBackgroundScanJob(callable $callback, $path) { |
| 489 | 500 | try { |
| 490 | 501 | $callback(); |
@@ -206,7 +206,7 @@ |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
| 209 | - * @param $fileId |
|
| 209 | + * @param integer $fileId |
|
| 210 | 210 | * @return array |
| 211 | 211 | * @throws \OCP\Files\NotFoundException |
| 212 | 212 | */ |
@@ -24,14 +24,11 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace OC\Files\Config; |
| 26 | 26 | |
| 27 | -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
|
| 28 | -use OC\Files\Filesystem; |
|
| 29 | 27 | use OCA\Files_Sharing\SharedMount; |
| 30 | 28 | use OCP\DB\QueryBuilder\IQueryBuilder; |
| 31 | 29 | use OCP\Files\Config\ICachedMountInfo; |
| 32 | 30 | use OCP\Files\Config\IUserMountCache; |
| 33 | 31 | use OCP\Files\Mount\IMountPoint; |
| 34 | -use OCP\Files\Node; |
|
| 35 | 32 | use OCP\Files\NotFoundException; |
| 36 | 33 | use OCP\ICache; |
| 37 | 34 | use OCP\IDBConnection; |
@@ -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 | |
@@ -338,6 +338,9 @@ discard block |
||
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | + /** |
|
| 342 | + * @param string $root |
|
| 343 | + */ |
|
| 341 | 344 | static public function init($user, $root) { |
| 342 | 345 | if (self::$defaultInstance) { |
| 343 | 346 | return false; |
@@ -521,7 +524,7 @@ discard block |
||
| 521 | 524 | /** |
| 522 | 525 | * mount an \OC\Files\Storage\Storage in our virtual filesystem |
| 523 | 526 | * |
| 524 | - * @param \OC\Files\Storage\Storage|string $class |
|
| 527 | + * @param string $class |
|
| 525 | 528 | * @param array $arguments |
| 526 | 529 | * @param string $mountpoint |
| 527 | 530 | */ |
@@ -653,6 +656,9 @@ discard block |
||
| 653 | 656 | return self::$defaultInstance->is_dir($path); |
| 654 | 657 | } |
| 655 | 658 | |
| 659 | + /** |
|
| 660 | + * @param string $path |
|
| 661 | + */ |
|
| 656 | 662 | static public function is_file($path) { |
| 657 | 663 | return self::$defaultInstance->is_file($path); |
| 658 | 664 | } |
@@ -665,6 +671,9 @@ discard block |
||
| 665 | 671 | return self::$defaultInstance->filetype($path); |
| 666 | 672 | } |
| 667 | 673 | |
| 674 | + /** |
|
| 675 | + * @param string $path |
|
| 676 | + */ |
|
| 668 | 677 | static public function filesize($path) { |
| 669 | 678 | return self::$defaultInstance->filesize($path); |
| 670 | 679 | } |
@@ -677,6 +686,9 @@ discard block |
||
| 677 | 686 | return self::$defaultInstance->isCreatable($path); |
| 678 | 687 | } |
| 679 | 688 | |
| 689 | + /** |
|
| 690 | + * @param string $path |
|
| 691 | + */ |
|
| 680 | 692 | static public function isReadable($path) { |
| 681 | 693 | return self::$defaultInstance->isReadable($path); |
| 682 | 694 | } |
@@ -689,6 +701,9 @@ discard block |
||
| 689 | 701 | return self::$defaultInstance->isDeletable($path); |
| 690 | 702 | } |
| 691 | 703 | |
| 704 | + /** |
|
| 705 | + * @param string $path |
|
| 706 | + */ |
|
| 692 | 707 | static public function isSharable($path) { |
| 693 | 708 | return self::$defaultInstance->isSharable($path); |
| 694 | 709 | } |
@@ -706,6 +721,7 @@ discard block |
||
| 706 | 721 | } |
| 707 | 722 | |
| 708 | 723 | /** |
| 724 | + * @param string $path |
|
| 709 | 725 | * @return string |
| 710 | 726 | */ |
| 711 | 727 | static public function file_get_contents($path) { |
@@ -728,6 +744,10 @@ discard block |
||
| 728 | 744 | return self::$defaultInstance->copy($path1, $path2); |
| 729 | 745 | } |
| 730 | 746 | |
| 747 | + /** |
|
| 748 | + * @param string $path |
|
| 749 | + * @param string $mode |
|
| 750 | + */ |
|
| 731 | 751 | static public function fopen($path, $mode) { |
| 732 | 752 | return self::$defaultInstance->fopen($path, $mode); |
| 733 | 753 | } |
@@ -743,6 +763,9 @@ discard block |
||
| 743 | 763 | return self::$defaultInstance->fromTmpFile($tmpFile, $path); |
| 744 | 764 | } |
| 745 | 765 | |
| 766 | + /** |
|
| 767 | + * @param string $path |
|
| 768 | + */ |
|
| 746 | 769 | static public function getMimeType($path) { |
| 747 | 770 | return self::$defaultInstance->getMimeType($path); |
| 748 | 771 | } |
@@ -755,6 +778,9 @@ discard block |
||
| 755 | 778 | return self::$defaultInstance->free_space($path); |
| 756 | 779 | } |
| 757 | 780 | |
| 781 | + /** |
|
| 782 | + * @param string $query |
|
| 783 | + */ |
|
| 758 | 784 | static public function search($query) { |
| 759 | 785 | return self::$defaultInstance->search($query); |
| 760 | 786 | } |
@@ -868,7 +894,7 @@ discard block |
||
| 868 | 894 | * @param string $path |
| 869 | 895 | * @param boolean $includeMountPoints whether to add mountpoint sizes, |
| 870 | 896 | * defaults to true |
| 871 | - * @return \OC\Files\FileInfo|bool False if file does not exist |
|
| 897 | + * @return \OCP\Files\FileInfo|null False if file does not exist |
|
| 872 | 898 | */ |
| 873 | 899 | public static function getFileInfo($path, $includeMountPoints = true) { |
| 874 | 900 | return self::$defaultInstance->getFileInfo($path, $includeMountPoints); |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | * Magic method to first get the real rootFolder and then |
| 53 | 53 | * call $method with $args on it |
| 54 | 54 | * |
| 55 | - * @param $method |
|
| 55 | + * @param string $method |
|
| 56 | 56 | * @param $args |
| 57 | 57 | * @return mixed |
| 58 | 58 | */ |
@@ -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 | } |
@@ -982,7 +982,7 @@ |
||
| 982 | 982 | /** |
| 983 | 983 | * check if path points to a files version |
| 984 | 984 | * |
| 985 | - * @param $path |
|
| 985 | + * @param string $path |
|
| 986 | 986 | * @return bool |
| 987 | 987 | */ |
| 988 | 988 | protected function isVersion($path) { |
@@ -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) { |