@@ -22,15 +22,12 @@ |
||
22 | 22 | namespace OCA\Files_External\Command; |
23 | 23 | |
24 | 24 | use OC\Core\Command\Base; |
25 | -use OCA\Files_external\Lib\StorageConfig; |
|
26 | 25 | use OCA\Files_external\NotFoundException; |
27 | 26 | use OCA\Files_external\Service\GlobalStoragesService; |
28 | 27 | use OCA\Files_external\Service\UserStoragesService; |
29 | 28 | use OCP\IUserManager; |
30 | 29 | use OCP\IUserSession; |
31 | 30 | use Symfony\Component\Console\Command\Command; |
32 | -use Symfony\Component\Console\Helper\Table; |
|
33 | -use Symfony\Component\Console\Helper\TableHelper; |
|
34 | 31 | use Symfony\Component\Console\Input\ArrayInput; |
35 | 32 | use Symfony\Component\Console\Input\InputArgument; |
36 | 33 | use Symfony\Component\Console\Input\InputInterface; |
@@ -34,7 +34,6 @@ |
||
34 | 34 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
35 | 35 | use OCP\IConfig; |
36 | 36 | use OCP\ILogger; |
37 | -use OCP\IUser; |
|
38 | 37 | use OCP\IUserSession; |
39 | 38 | |
40 | 39 | class Crypt { |
@@ -34,7 +34,6 @@ |
||
34 | 34 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
35 | 35 | use OCP\IConfig; |
36 | 36 | use OCP\ILogger; |
37 | -use OCP\IUser; |
|
38 | 37 | use OCP\IUserSession; |
39 | 38 | |
40 | 39 | class Crypt { |
@@ -95,7 +95,7 @@ |
||
95 | 95 | * returns a reference to the comments node |
96 | 96 | * |
97 | 97 | * @param Node $node |
98 | - * @return mixed|string |
|
98 | + * @return null|string |
|
99 | 99 | */ |
100 | 100 | public function getCommentsLink(Node $node) { |
101 | 101 | $href = $this->server->getBaseUri(); |
@@ -28,8 +28,6 @@ |
||
28 | 28 | use OCP\IGroupManager; |
29 | 29 | use OCP\IUserManager; |
30 | 30 | use Symfony\Component\Console\Command\Command; |
31 | -use Symfony\Component\Console\Helper\Table; |
|
32 | -use Symfony\Component\Console\Helper\TableHelper; |
|
33 | 31 | use Symfony\Component\Console\Input\InputArgument; |
34 | 32 | use Symfony\Component\Console\Input\InputInterface; |
35 | 33 | use Symfony\Component\Console\Input\InputOption; |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | |
394 | 394 | /** |
395 | 395 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
396 | - * @param string $dn the dn of the user object |
|
396 | + * @param string $fdn the dn of the user object |
|
397 | 397 | * @param string $ldapName optional, the display name of the object |
398 | 398 | * @return string|false with with the name to use in ownCloud |
399 | 399 | */ |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | |
411 | 411 | /** |
412 | 412 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
413 | - * @param string $dn the dn of the user object |
|
413 | + * @param string $fdn the dn of the user object |
|
414 | 414 | * @param string $ldapName optional, the display name of the object |
415 | 415 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
416 | 416 | * @return string|false with with the name to use in ownCloud |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | * the login filter. |
666 | 666 | * |
667 | 667 | * @param string $loginName |
668 | - * @param array $attributes optional, list of attributes to read |
|
668 | + * @param string[] $attributes optional, list of attributes to read |
|
669 | 669 | * @return array |
670 | 670 | */ |
671 | 671 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -731,7 +731,7 @@ discard block |
||
731 | 731 | |
732 | 732 | /** |
733 | 733 | * @param string $filter |
734 | - * @param string|string[] $attr |
|
734 | + * @param string[] $attr |
|
735 | 735 | * @param int $limit |
736 | 736 | * @param int $offset |
737 | 737 | * @return array |
@@ -779,7 +779,7 @@ discard block |
||
779 | 779 | |
780 | 780 | /** |
781 | 781 | * @param string $filter |
782 | - * @param string|string[] $attr |
|
782 | + * @param string[] $attr |
|
783 | 783 | * @param int $limit |
784 | 784 | * @param int $offset |
785 | 785 | * @return false|int |
@@ -829,6 +829,7 @@ discard block |
||
829 | 829 | * retrieved. Results will according to the order in the array. |
830 | 830 | * @param int $limit optional, maximum results to be counted |
831 | 831 | * @param int $offset optional, a starting point |
832 | + * @param string $filter |
|
832 | 833 | * @return array|false array with the search result as first value and pagedSearchOK as |
833 | 834 | * second | false if not successful |
834 | 835 | */ |
@@ -875,7 +876,7 @@ discard block |
||
875 | 876 | * @param bool $pagedSearchOK whether a paged search has been executed |
876 | 877 | * @param bool $skipHandling required for paged search when cookies to |
877 | 878 | * prior results need to be gained |
878 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
879 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
879 | 880 | */ |
880 | 881 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
881 | 882 | $cookie = null; |
@@ -1092,7 +1093,7 @@ discard block |
||
1092 | 1093 | |
1093 | 1094 | /** |
1094 | 1095 | * @param string $name |
1095 | - * @return bool|mixed|string |
|
1096 | + * @return string |
|
1096 | 1097 | */ |
1097 | 1098 | public function sanitizeUsername($name) { |
1098 | 1099 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1116,6 +1117,7 @@ discard block |
||
1116 | 1117 | * escapes (user provided) parts for LDAP filter |
1117 | 1118 | * @param string $input, the provided value |
1118 | 1119 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1120 | + * @param string $input |
|
1119 | 1121 | * @return string the escaped string |
1120 | 1122 | */ |
1121 | 1123 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1675,7 +1677,7 @@ discard block |
||
1675 | 1677 | |
1676 | 1678 | /** |
1677 | 1679 | * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. |
1678 | - * @return boolean|null true on success, null or false otherwise |
|
1680 | + * @return boolean true on success, null or false otherwise |
|
1679 | 1681 | */ |
1680 | 1682 | public function getPagedSearchResultState() { |
1681 | 1683 | $result = $this->pagedSearchedSuccessful; |
@@ -1690,7 +1692,7 @@ discard block |
||
1690 | 1692 | * @param string[] $attr optional, when a certain attribute shall be filtered outside |
1691 | 1693 | * @param int $limit |
1692 | 1694 | * @param int $offset |
1693 | - * @return bool|true |
|
1695 | + * @return boolean |
|
1694 | 1696 | */ |
1695 | 1697 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
1696 | 1698 | $pagedSearchOK = false; |
@@ -463,7 +463,7 @@ |
||
463 | 463 | /** |
464 | 464 | * get database row of a give share |
465 | 465 | * |
466 | - * @param $id |
|
466 | + * @param integer $id |
|
467 | 467 | * @return array |
468 | 468 | * @throws ShareNotFound |
469 | 469 | */ |
@@ -25,7 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use OC\Share20\Share; |
27 | 27 | use OCP\Files\IRootFolder; |
28 | -use OCP\IAppConfig; |
|
29 | 28 | use OCP\IConfig; |
30 | 29 | use OCP\IL10N; |
31 | 30 | use OCP\ILogger; |
@@ -22,18 +22,12 @@ |
||
22 | 22 | namespace OCA\Files_External\Command; |
23 | 23 | |
24 | 24 | use OC\Core\Command\Base; |
25 | -use OCA\Files_External\Lib\Auth\AuthMechanism; |
|
26 | 25 | use OCA\Files_External\Lib\Backend\Backend; |
27 | 26 | use OCA\Files_External\Lib\DefinitionParameter; |
28 | 27 | use OCA\Files_External\Service\BackendService; |
29 | 28 | use Symfony\Component\Console\Command\Command; |
30 | -use Symfony\Component\Console\Helper\Table; |
|
31 | -use Symfony\Component\Console\Helper\TableHelper; |
|
32 | -use Symfony\Component\Console\Input\ArrayInput; |
|
33 | 29 | use Symfony\Component\Console\Input\InputArgument; |
34 | 30 | use Symfony\Component\Console\Input\InputInterface; |
35 | -use Symfony\Component\Console\Input\InputOption; |
|
36 | -use Symfony\Component\Console\Input\Input; |
|
37 | 31 | use Symfony\Component\Console\Output\OutputInterface; |
38 | 32 | |
39 | 33 | class Backends extends Base { |
@@ -30,18 +30,14 @@ |
||
30 | 30 | use OCA\Files_external\Lib\StorageConfig; |
31 | 31 | use OCA\Files_External\Service\BackendService; |
32 | 32 | use OCA\Files_external\Service\GlobalStoragesService; |
33 | -use OCA\Files_external\Service\ImportLegacyStoragesService; |
|
34 | 33 | use OCA\Files_external\Service\UserStoragesService; |
35 | 34 | use OCP\IUserManager; |
36 | 35 | use OCP\IUserSession; |
37 | 36 | use Symfony\Component\Console\Command\Command; |
38 | -use Symfony\Component\Console\Helper\Table; |
|
39 | -use Symfony\Component\Console\Helper\TableHelper; |
|
40 | 37 | use Symfony\Component\Console\Input\ArrayInput; |
41 | 38 | use Symfony\Component\Console\Input\InputArgument; |
42 | 39 | use Symfony\Component\Console\Input\InputInterface; |
43 | 40 | use Symfony\Component\Console\Input\InputOption; |
44 | -use Symfony\Component\Console\Input\Input; |
|
45 | 41 | use Symfony\Component\Console\Output\OutputInterface; |
46 | 42 | |
47 | 43 | class Create extends Base { |