@@ -138,6 +138,9 @@ |
||
| 138 | 138 | return true; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | + /** |
|
| 142 | + * @param string $target |
|
| 143 | + */ |
|
| 141 | 144 | public static function getSharesFromItem($target) { |
| 142 | 145 | $result = array(); |
| 143 | 146 | $owner = \OC\Files\Filesystem::getOwner($target); |
@@ -20,6 +20,11 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | protected $storage = null; |
| 22 | 22 | |
| 23 | + /** |
|
| 24 | + * @param string $storage |
|
| 25 | + * @param string $mountpoint |
|
| 26 | + * @param \OC\Files\Storage\StorageFactory $loader |
|
| 27 | + */ |
|
| 23 | 28 | public function __construct($storage, $mountpoint, $arguments = null, $loader = null) { |
| 24 | 29 | // first update the mount point before creating the parent |
| 25 | 30 | $newMountPoint = $this->verifyMountPoint($arguments['share'], $arguments['user']); |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use OCA\Files_Sharing\Application; |
| 15 | 15 | use OCP\AppFramework\Http\NotFoundResponse; |
| 16 | 16 | use OCP\AppFramework\IAppContainer; |
| 17 | -use OCP\Files; |
|
| 18 | 17 | use OCP\AppFramework\Http\RedirectResponse; |
| 19 | 18 | use OCP\AppFramework\Http\TemplateResponse; |
| 20 | 19 | use OCP\Security\ISecureRandom; |
@@ -39,6 +39,9 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | private static $scannedVersions = false; |
| 41 | 41 | |
| 42 | + /** |
|
| 43 | + * @param string $filename |
|
| 44 | + */ |
|
| 42 | 45 | public static function getUidAndFilename($filename) { |
| 43 | 46 | $uid = \OC\Files\Filesystem::getOwner($filename); |
| 44 | 47 | \OC\Files\Filesystem::initMountPoints($uid); |
@@ -399,7 +402,7 @@ discard block |
||
| 399 | 402 | * @param string $uniqueFilename new file name to restore the file without overwriting existing files |
| 400 | 403 | * @param string $location location if file |
| 401 | 404 | * @param int $timestamp deletion time |
| 402 | - * @return bool |
|
| 405 | + * @return false|null |
|
| 403 | 406 | */ |
| 404 | 407 | private static function restoreVersions(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) { |
| 405 | 408 | |
@@ -453,7 +456,7 @@ discard block |
||
| 453 | 456 | * @param string $uniqueFilename new file name to restore the file without overwriting existing files |
| 454 | 457 | * @param string $location location of file |
| 455 | 458 | * @param int $timestamp deletion time |
| 456 | - * @return bool |
|
| 459 | + * @return false|null |
|
| 457 | 460 | */ |
| 458 | 461 | private static function restoreEncryptionKeys(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) { |
| 459 | 462 | |
@@ -550,9 +553,9 @@ discard block |
||
| 550 | 553 | |
| 551 | 554 | /** |
| 552 | 555 | * @param \OC\Files\View $view |
| 553 | - * @param $file |
|
| 554 | - * @param $filename |
|
| 555 | - * @param $timestamp |
|
| 556 | + * @param string $file |
|
| 557 | + * @param string $filename |
|
| 558 | + * @param integer|null $timestamp |
|
| 556 | 559 | * @return int |
| 557 | 560 | */ |
| 558 | 561 | private static function deleteVersions(\OC\Files\View $view, $file, $filename, $timestamp) { |
@@ -579,9 +582,9 @@ discard block |
||
| 579 | 582 | |
| 580 | 583 | /** |
| 581 | 584 | * @param \OC\Files\View $view |
| 582 | - * @param $file |
|
| 583 | - * @param $filename |
|
| 584 | - * @param $timestamp |
|
| 585 | + * @param string $file |
|
| 586 | + * @param string $filename |
|
| 587 | + * @param integer|null $timestamp |
|
| 585 | 588 | * @return int |
| 586 | 589 | */ |
| 587 | 590 | private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp) { |
@@ -8,9 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace OCA\Files_trashbin\Tests\Storage; |
| 10 | 10 | |
| 11 | -use OC\Files\Storage\Home; |
|
| 12 | 11 | use OC\Files\Storage\Temporary; |
| 13 | -use OC\Files\Mount\MountPoint; |
|
| 14 | 12 | use OC\Files\Filesystem; |
| 15 | 13 | |
| 16 | 14 | class Storage extends \Test\TestCase { |
@@ -531,6 +531,7 @@ |
||
| 531 | 531 | |
| 532 | 532 | /** |
| 533 | 533 | * Erase a file's versions which exceed the set quota |
| 534 | + * @param integer $versionsSize |
|
| 534 | 535 | */ |
| 535 | 536 | private static function expire($filename, $versionsSize = null, $offset = 0) { |
| 536 | 537 | $config = \OC::$server->getConfig(); |
@@ -620,7 +620,6 @@ |
||
| 620 | 620 | /** |
| 621 | 621 | * @param string $user |
| 622 | 622 | * @param bool $create |
| 623 | - * @param bool $password |
|
| 624 | 623 | */ |
| 625 | 624 | public static function loginHelper($user, $create = false) { |
| 626 | 625 | |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use Symfony\Component\Console\Command\Command; |
| 29 | 29 | use Symfony\Component\Console\Helper\Table; |
| 30 | 30 | use Symfony\Component\Console\Input\InputInterface; |
| 31 | -use Symfony\Component\Console\Input\InputOption; |
|
| 32 | 31 | use Symfony\Component\Console\Output\OutputInterface; |
| 33 | 32 | |
| 34 | 33 | class ListCertificates extends Base { |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | /** |
| 339 | 339 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
| 340 | - * @param string $dn the dn of the user object |
|
| 340 | + * @param string $fdn the dn of the user object |
|
| 341 | 341 | * @param string $ldapName optional, the display name of the object |
| 342 | 342 | * @return string with with the name to use in ownCloud |
| 343 | 343 | */ |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | /** |
| 356 | 356 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
| 357 | - * @param string $dn the dn of the user object |
|
| 357 | + * @param string $fdn the dn of the user object |
|
| 358 | 358 | * @param string $ldapName optional, the display name of the object |
| 359 | 359 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
| 360 | 360 | * @return string with with the name to use in ownCloud |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | |
| 641 | 641 | /** |
| 642 | 642 | * @param string $filter |
| 643 | - * @param string|string[] $attr |
|
| 643 | + * @param string[] $attr |
|
| 644 | 644 | * @param int $limit |
| 645 | 645 | * @param int $offset |
| 646 | 646 | * @return false|int |
@@ -679,6 +679,7 @@ discard block |
||
| 679 | 679 | * retrieved. Results will according to the order in the array. |
| 680 | 680 | * @param int $limit optional, maximum results to be counted |
| 681 | 681 | * @param int $offset optional, a starting point |
| 682 | + * @param string $filter |
|
| 682 | 683 | * @return array|false array with the search result as first value and pagedSearchOK as |
| 683 | 684 | * second | false if not successful |
| 684 | 685 | */ |
@@ -935,7 +936,7 @@ discard block |
||
| 935 | 936 | |
| 936 | 937 | /** |
| 937 | 938 | * @param string $name |
| 938 | - * @return bool|mixed|string |
|
| 939 | + * @return string |
|
| 939 | 940 | */ |
| 940 | 941 | public function sanitizeUsername($name) { |
| 941 | 942 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -959,6 +960,7 @@ discard block |
||
| 959 | 960 | * escapes (user provided) parts for LDAP filter |
| 960 | 961 | * @param string $input, the provided value |
| 961 | 962 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
| 963 | + * @param string $input |
|
| 962 | 964 | * @return string the escaped string |
| 963 | 965 | */ |
| 964 | 966 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1477,7 +1479,7 @@ discard block |
||
| 1477 | 1479 | |
| 1478 | 1480 | /** |
| 1479 | 1481 | * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. |
| 1480 | - * @return boolean|null true on success, null or false otherwise |
|
| 1482 | + * @return boolean true on success, null or false otherwise |
|
| 1481 | 1483 | */ |
| 1482 | 1484 | public function getPagedSearchResultState() { |
| 1483 | 1485 | $result = $this->pagedSearchedSuccessful; |
@@ -1492,7 +1494,7 @@ discard block |
||
| 1492 | 1494 | * @param string[] $attr optional, when a certain attribute shall be filtered outside |
| 1493 | 1495 | * @param int $limit |
| 1494 | 1496 | * @param int $offset |
| 1495 | - * @return bool|true |
|
| 1497 | + * @return boolean |
|
| 1496 | 1498 | */ |
| 1497 | 1499 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
| 1498 | 1500 | $pagedSearchOK = false; |