@@ -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 | |
@@ -337,6 +337,9 @@ discard block |
||
| 337 | 337 | } |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | + /** |
|
| 341 | + * @param string $root |
|
| 342 | + */ |
|
| 340 | 343 | static public function init($user, $root) { |
| 341 | 344 | if (self::$defaultInstance) { |
| 342 | 345 | return false; |
@@ -517,7 +520,7 @@ discard block |
||
| 517 | 520 | /** |
| 518 | 521 | * mount an \OC\Files\Storage\Storage in our virtual filesystem |
| 519 | 522 | * |
| 520 | - * @param \OC\Files\Storage\Storage|string $class |
|
| 523 | + * @param string $class |
|
| 521 | 524 | * @param array $arguments |
| 522 | 525 | * @param string $mountpoint |
| 523 | 526 | */ |
@@ -628,6 +631,7 @@ discard block |
||
| 628 | 631 | |
| 629 | 632 | /** |
| 630 | 633 | * following functions are equivalent to their php builtin equivalents for arguments/return values. |
| 634 | + * @param string $path |
|
| 631 | 635 | */ |
| 632 | 636 | static public function mkdir($path) { |
| 633 | 637 | return self::$defaultInstance->mkdir($path); |
@@ -649,6 +653,9 @@ discard block |
||
| 649 | 653 | return self::$defaultInstance->is_dir($path); |
| 650 | 654 | } |
| 651 | 655 | |
| 656 | + /** |
|
| 657 | + * @param string $path |
|
| 658 | + */ |
|
| 652 | 659 | static public function is_file($path) { |
| 653 | 660 | return self::$defaultInstance->is_file($path); |
| 654 | 661 | } |
@@ -661,6 +668,9 @@ discard block |
||
| 661 | 668 | return self::$defaultInstance->filetype($path); |
| 662 | 669 | } |
| 663 | 670 | |
| 671 | + /** |
|
| 672 | + * @param string $path |
|
| 673 | + */ |
|
| 664 | 674 | static public function filesize($path) { |
| 665 | 675 | return self::$defaultInstance->filesize($path); |
| 666 | 676 | } |
@@ -673,6 +683,9 @@ discard block |
||
| 673 | 683 | return self::$defaultInstance->isCreatable($path); |
| 674 | 684 | } |
| 675 | 685 | |
| 686 | + /** |
|
| 687 | + * @param string $path |
|
| 688 | + */ |
|
| 676 | 689 | static public function isReadable($path) { |
| 677 | 690 | return self::$defaultInstance->isReadable($path); |
| 678 | 691 | } |
@@ -685,6 +698,9 @@ discard block |
||
| 685 | 698 | return self::$defaultInstance->isDeletable($path); |
| 686 | 699 | } |
| 687 | 700 | |
| 701 | + /** |
|
| 702 | + * @param string $path |
|
| 703 | + */ |
|
| 688 | 704 | static public function isSharable($path) { |
| 689 | 705 | return self::$defaultInstance->isSharable($path); |
| 690 | 706 | } |
@@ -702,6 +718,7 @@ discard block |
||
| 702 | 718 | } |
| 703 | 719 | |
| 704 | 720 | /** |
| 721 | + * @param string $path |
|
| 705 | 722 | * @return string |
| 706 | 723 | */ |
| 707 | 724 | static public function file_get_contents($path) { |
@@ -724,6 +741,10 @@ discard block |
||
| 724 | 741 | return self::$defaultInstance->copy($path1, $path2); |
| 725 | 742 | } |
| 726 | 743 | |
| 744 | + /** |
|
| 745 | + * @param string $path |
|
| 746 | + * @param string $mode |
|
| 747 | + */ |
|
| 727 | 748 | static public function fopen($path, $mode) { |
| 728 | 749 | return self::$defaultInstance->fopen($path, $mode); |
| 729 | 750 | } |
@@ -739,6 +760,9 @@ discard block |
||
| 739 | 760 | return self::$defaultInstance->fromTmpFile($tmpFile, $path); |
| 740 | 761 | } |
| 741 | 762 | |
| 763 | + /** |
|
| 764 | + * @param string $path |
|
| 765 | + */ |
|
| 742 | 766 | static public function getMimeType($path) { |
| 743 | 767 | return self::$defaultInstance->getMimeType($path); |
| 744 | 768 | } |
@@ -751,6 +775,9 @@ discard block |
||
| 751 | 775 | return self::$defaultInstance->free_space($path); |
| 752 | 776 | } |
| 753 | 777 | |
| 778 | + /** |
|
| 779 | + * @param string $query |
|
| 780 | + */ |
|
| 754 | 781 | static public function search($query) { |
| 755 | 782 | return self::$defaultInstance->search($query); |
| 756 | 783 | } |
@@ -860,7 +887,7 @@ discard block |
||
| 860 | 887 | * @param string $path |
| 861 | 888 | * @param boolean $includeMountPoints whether to add mountpoint sizes, |
| 862 | 889 | * defaults to true |
| 863 | - * @return \OC\Files\FileInfo|bool False if file does not exist |
|
| 890 | + * @return \OCP\Files\FileInfo|null False if file does not exist |
|
| 864 | 891 | */ |
| 865 | 892 | public static function getFileInfo($path, $includeMountPoints = true) { |
| 866 | 893 | return self::$defaultInstance->getFileInfo($path, $includeMountPoints); |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | use OC\Share\MailNotifications; |
| 23 | -use OCP\IConfig; |
|
| 24 | 23 | use OCP\IL10N; |
| 25 | 24 | use OCP\IUser; |
| 26 | 25 | use OCP\Mail\IMailer; |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | /** |
| 107 | 107 | * Returns an array with all the child nodes |
| 108 | 108 | * |
| 109 | - * @return \Sabre\DAV\INode[] |
|
| 109 | + * @return CommentNode[] |
|
| 110 | 110 | */ |
| 111 | 111 | function getChildren() { |
| 112 | 112 | return $this->findChildren(); |
@@ -145,7 +145,7 @@ |
||
| 145 | 145 | /** |
| 146 | 146 | * Returns an array with all the child nodes |
| 147 | 147 | * |
| 148 | - * @return \Sabre\DAV\INode[] |
|
| 148 | + * @return EntityTypeCollection[] |
|
| 149 | 149 | */ |
| 150 | 150 | function getChildren() { |
| 151 | 151 | $this->initCollections(); |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace OCA\Federation\Command; |
| 4 | 4 | |
| 5 | -use OCA\Federation\DbHandler; |
|
| 6 | 5 | use Symfony\Component\Console\Command\Command; |
| 7 | 6 | use Symfony\Component\Console\Helper\ProgressBar; |
| 8 | 7 | use Symfony\Component\Console\Input\InputInterface; |
@@ -3,10 +3,6 @@ |
||
| 3 | 3 | namespace OCA\Federation; |
| 4 | 4 | |
| 5 | 5 | use OCA\DAV\CardDAV\SyncService; |
| 6 | -use Symfony\Component\Console\Command\Command; |
|
| 7 | -use Symfony\Component\Console\Helper\ProgressBar; |
|
| 8 | -use Symfony\Component\Console\Input\InputInterface; |
|
| 9 | -use Symfony\Component\Console\Output\OutputInterface; |
|
| 10 | 6 | |
| 11 | 7 | class SyncFederationAddressBooks { |
| 12 | 8 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * @param array $entry |
| 70 | - * @return array |
|
| 70 | + * @return string |
|
| 71 | 71 | */ |
| 72 | 72 | protected function formatCacheEntry($entry) { |
| 73 | 73 | if (isset($entry['path'])) { |
@@ -185,6 +185,9 @@ discard block |
||
| 185 | 185 | return $this->cache->getStatus($this->getSourcePath($file)); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | + /** |
|
| 189 | + * @param \OCP\Files\Cache\ICacheEntry[] $results |
|
| 190 | + */ |
|
| 188 | 191 | private function formatSearchResults($results) { |
| 189 | 192 | $results = array_filter($results, array($this, 'filterCacheEntry')); |
| 190 | 193 | $results = array_values($results); |
@@ -263,7 +266,7 @@ discard block |
||
| 263 | 266 | * use the one with the highest id gives the best result with the background scanner, since that is most |
| 264 | 267 | * likely the folder where we stopped scanning previously |
| 265 | 268 | * |
| 266 | - * @return string|bool the path of the folder or false when no folder matched |
|
| 269 | + * @return boolean the path of the folder or false when no folder matched |
|
| 267 | 270 | */ |
| 268 | 271 | public function getIncomplete() { |
| 269 | 272 | // not supported |
@@ -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 | */ |
@@ -21,14 +21,11 @@ |
||
| 21 | 21 | |
| 22 | 22 | namespace OC\Files\Config; |
| 23 | 23 | |
| 24 | -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
|
| 25 | -use OC\Files\Filesystem; |
|
| 26 | 24 | use OCP\DB\QueryBuilder\IQueryBuilder; |
| 27 | 25 | use OCP\Files\Config\ICachedMountInfo; |
| 28 | 26 | use OCP\Files\Config\IUserMountCache; |
| 29 | 27 | use OCP\Files\Mount\IMountPoint; |
| 30 | 28 | use OCP\Files\NotFoundException; |
| 31 | -use OCP\ICache; |
|
| 32 | 29 | use OCP\IDBConnection; |
| 33 | 30 | use OCP\ILogger; |
| 34 | 31 | use OCP\IUser; |
@@ -256,6 +256,11 @@ |
||
| 256 | 256 | */ |
| 257 | 257 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
| 258 | 258 | // FIXME This is also the reason, why it is not in the public interface |
| 259 | + |
|
| 260 | + /** |
|
| 261 | + * @param string|boolean $app |
|
| 262 | + * @param string|null $lang |
|
| 263 | + */ |
|
| 259 | 264 | public function getL10nFilesForApp($app, $lang) { |
| 260 | 265 | $languageFiles = []; |
| 261 | 266 | |