@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @NoAdminRequired |
| 73 | 73 | * @NoSubadminRequired |
| 74 | - * @return array |
|
| 74 | + * @return DataResponse |
|
| 75 | 75 | */ |
| 76 | 76 | public function addPersonalRootCertificate() { |
| 77 | 77 | return $this->addCertificate($this->userCertificateManager); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * Add a new root certificate to a trust store |
| 82 | 82 | * |
| 83 | 83 | * @param ICertificateManager $certificateManager |
| 84 | - * @return array |
|
| 84 | + * @return DataResponse |
|
| 85 | 85 | */ |
| 86 | 86 | private function addCertificate(ICertificateManager $certificateManager) { |
| 87 | 87 | $headers = []; |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | /** |
| 160 | 160 | * Add a new personal root certificate to the system's trust store |
| 161 | 161 | * |
| 162 | - * @return array |
|
| 162 | + * @return DataResponse |
|
| 163 | 163 | */ |
| 164 | 164 | public function addSystemRootCertificate() { |
| 165 | 165 | return $this->addCertificate($this->systemCertificateManager); |
@@ -268,7 +268,7 @@ |
||
| 268 | 268 | |
| 269 | 269 | /** |
| 270 | 270 | * @NoCSRFRequired |
| 271 | - * @return DataResponse |
|
| 271 | + * @return DataDisplayResponse |
|
| 272 | 272 | */ |
| 273 | 273 | public function getFailedIntegrityCheckFiles() { |
| 274 | 274 | if(!$this->checker->isCodeCheckEnforced()) { |
@@ -30,8 +30,6 @@ |
||
| 30 | 30 | use OCA\Files_external\Service\GlobalStoragesService; |
| 31 | 31 | use OCP\Files\StorageNotAvailableException; |
| 32 | 32 | use Symfony\Component\Console\Command\Command; |
| 33 | -use Symfony\Component\Console\Helper\Table; |
|
| 34 | -use Symfony\Component\Console\Helper\TableHelper; |
|
| 35 | 33 | use Symfony\Component\Console\Input\InputArgument; |
| 36 | 34 | use Symfony\Component\Console\Input\InputInterface; |
| 37 | 35 | use Symfony\Component\Console\Input\InputOption; |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCA\Files_External\Lib\Auth\AuthMechanism; |
| 28 | 28 | use \OCP\IConfig; |
| 29 | 29 | use OCP\ILogger; |
| 30 | -use OCP\IUser; |
|
| 31 | 30 | use \OCP\IUserSession; |
| 32 | 31 | use \OCP\IRequest; |
| 33 | 32 | use \OCP\IL10N; |
@@ -303,6 +303,7 @@ |
||
| 303 | 303 | * get default share folder |
| 304 | 304 | * |
| 305 | 305 | * @param \OC\Files\View |
| 306 | + * @param View $view |
|
| 306 | 307 | * @return string |
| 307 | 308 | */ |
| 308 | 309 | public static function getShareFolder($view = null) { |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | * @param string $path |
| 100 | 100 | * @param View $view |
| 101 | 101 | * @param SharedMount[] $mountpoints |
| 102 | - * @return mixed |
|
| 102 | + * @return string |
|
| 103 | 103 | */ |
| 104 | 104 | private function generateUniqueTarget($path, $view, array $mountpoints) { |
| 105 | 105 | $pathinfo = pathinfo($path); |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | |
| 30 | 30 | namespace OC; |
| 31 | -use OC_Defaults; |
|
| 32 | 31 | use OCP\ICacheFactory; |
| 33 | 32 | use OCP\IConfig; |
| 34 | 33 | use OCP\IURLGenerator; |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | |
| 398 | 398 | /** |
| 399 | 399 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
| 400 | - * @param string $dn the dn of the user object |
|
| 400 | + * @param string $fdn the dn of the user object |
|
| 401 | 401 | * @param string $ldapName optional, the display name of the object |
| 402 | 402 | * @return string|false with with the name to use in ownCloud |
| 403 | 403 | */ |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | |
| 415 | 415 | /** |
| 416 | 416 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
| 417 | - * @param string $dn the dn of the user object |
|
| 417 | + * @param string $fdn the dn of the user object |
|
| 418 | 418 | * @param string $ldapName optional, the display name of the object |
| 419 | 419 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
| 420 | 420 | * @return string|false with with the name to use in ownCloud |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | * the login filter. |
| 675 | 675 | * |
| 676 | 676 | * @param string $loginName |
| 677 | - * @param array $attributes optional, list of attributes to read |
|
| 677 | + * @param string[] $attributes optional, list of attributes to read |
|
| 678 | 678 | * @return array |
| 679 | 679 | */ |
| 680 | 680 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -747,7 +747,7 @@ discard block |
||
| 747 | 747 | |
| 748 | 748 | /** |
| 749 | 749 | * @param string $filter |
| 750 | - * @param string|string[] $attr |
|
| 750 | + * @param string[] $attr |
|
| 751 | 751 | * @param int $limit |
| 752 | 752 | * @param int $offset |
| 753 | 753 | * @return array |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | |
| 796 | 796 | /** |
| 797 | 797 | * @param string $filter |
| 798 | - * @param string|string[] $attr |
|
| 798 | + * @param string[] $attr |
|
| 799 | 799 | * @param int $limit |
| 800 | 800 | * @param int $offset |
| 801 | 801 | * @return false|int |
@@ -845,6 +845,7 @@ discard block |
||
| 845 | 845 | * retrieved. Results will according to the order in the array. |
| 846 | 846 | * @param int $limit optional, maximum results to be counted |
| 847 | 847 | * @param int $offset optional, a starting point |
| 848 | + * @param string $filter |
|
| 848 | 849 | * @return array|false array with the search result as first value and pagedSearchOK as |
| 849 | 850 | * second | false if not successful |
| 850 | 851 | */ |
@@ -891,7 +892,7 @@ discard block |
||
| 891 | 892 | * @param bool $pagedSearchOK whether a paged search has been executed |
| 892 | 893 | * @param bool $skipHandling required for paged search when cookies to |
| 893 | 894 | * prior results need to be gained |
| 894 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
| 895 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
| 895 | 896 | */ |
| 896 | 897 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
| 897 | 898 | $cookie = null; |
@@ -1100,7 +1101,7 @@ discard block |
||
| 1100 | 1101 | |
| 1101 | 1102 | /** |
| 1102 | 1103 | * @param string $name |
| 1103 | - * @return bool|mixed|string |
|
| 1104 | + * @return string |
|
| 1104 | 1105 | */ |
| 1105 | 1106 | public function sanitizeUsername($name) { |
| 1106 | 1107 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1124,6 +1125,7 @@ discard block |
||
| 1124 | 1125 | * escapes (user provided) parts for LDAP filter |
| 1125 | 1126 | * @param string $input, the provided value |
| 1126 | 1127 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
| 1128 | + * @param string $input |
|
| 1127 | 1129 | * @return string the escaped string |
| 1128 | 1130 | */ |
| 1129 | 1131 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1104,7 +1104,7 @@ |
||
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | 1106 | /** |
| 1107 | - * @param array $reqs |
|
| 1107 | + * @param string[] $reqs |
|
| 1108 | 1108 | * @return bool |
| 1109 | 1109 | */ |
| 1110 | 1110 | private function checkRequirements($reqs) { |